1 |
commit: 769b96c1ae9acb6e012823009f21b124b9fb693f |
2 |
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> |
3 |
AuthorDate: Sun Sep 26 18:42:23 2021 +0000 |
4 |
Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> |
5 |
CommitDate: Sun Sep 26 18:42:23 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=769b96c1 |
7 |
|
8 |
dev-python/daiquiri/files: remove wrong patches |
9 |
|
10 |
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com> |
11 |
|
12 |
.../testrepository-0.0.20-test-backport.patch | 62 ---------------------- |
13 |
.../testrepository-0.0.20-test-backport1.patch | 16 ------ |
14 |
.../testrepository-0.0.20-test-backport2.patch | 49 ----------------- |
15 |
3 files changed, 127 deletions(-) |
16 |
|
17 |
diff --git a/dev-python/daiquiri/files/testrepository-0.0.20-test-backport.patch b/dev-python/daiquiri/files/testrepository-0.0.20-test-backport.patch |
18 |
deleted file mode 100644 |
19 |
index d7ab87c06..000000000 |
20 |
--- a/dev-python/daiquiri/files/testrepository-0.0.20-test-backport.patch |
21 |
+++ /dev/null |
22 |
@@ -1,62 +0,0 @@ |
23 |
-From 8f8ab15fafdad6db850c84772323b32375b09285 Mon Sep 17 00:00:00 2001 |
24 |
-From: Robert Collins <robertc@×××××××××××××.net> |
25 |
-Date: Tue, 10 Mar 2015 15:21:49 +1300 |
26 |
-Subject: [PATCH] Fixup tests with latest testtools. |
27 |
- |
28 |
-Testtools has started chunking exceptions (which is perhaps good, |
29 |
-perhaps bad) - but we shouldn't depend on the exact behaviour in it |
30 |
-for our tests. |
31 |
---- a/NEWS |
32 |
-+++ b/NEWS |
33 |
-@@ -5,6 +5,12 @@ testrepository release notes |
34 |
- NEXT (In development) |
35 |
- +++++++++++++++++++++ |
36 |
- |
37 |
-+CHANGES |
38 |
-+------- |
39 |
-+ |
40 |
-+* Isolate the testrepository test suite from the chunking (or otherwise) |
41 |
-+ behaviour of testtools' exception handlers. (Robert Collins) |
42 |
-+ |
43 |
- 0.0.20 |
44 |
- ++++++ |
45 |
- |
46 |
---- a/testrepository/tests/test_repository.py |
47 |
-+++ b/testrepository/tests/test_repository.py |
48 |
-@@ -28,6 +28,7 @@ |
49 |
- from testresources import TestResource |
50 |
- from testtools import ( |
51 |
- clone_test_with_new_id, |
52 |
-+ content, |
53 |
- PlaceHolder, |
54 |
- ) |
55 |
- import testtools |
56 |
-@@ -103,19 +104,24 @@ class Case(ResourcedTestCase): |
57 |
- def passing(self): |
58 |
- pass |
59 |
- |
60 |
-- def failing(self): |
61 |
-- self.fail("oops") |
62 |
-- |
63 |
- def unexpected_success(self): |
64 |
- self.expectFailure("unexpected success", self.assertTrue, True) |
65 |
- |
66 |
- |
67 |
-+class FailingCase: |
68 |
-+ |
69 |
-+ def run(self, result): |
70 |
-+ result.startTest(self) |
71 |
-+ result.addError( |
72 |
-+ self, None, details={'traceback': content.text_content("")}) |
73 |
-+ result.stopTest(self) |
74 |
-+ |
75 |
- def make_test(id, should_pass): |
76 |
- """Make a test.""" |
77 |
- if should_pass: |
78 |
- case = Case("passing") |
79 |
- else: |
80 |
-- case = Case("failing") |
81 |
-+ case = FailingCase() |
82 |
- return clone_test_with_new_id(case, id) |
83 |
- |
84 |
- |
85 |
|
86 |
diff --git a/dev-python/daiquiri/files/testrepository-0.0.20-test-backport1.patch b/dev-python/daiquiri/files/testrepository-0.0.20-test-backport1.patch |
87 |
deleted file mode 100644 |
88 |
index 655d2c3e7..000000000 |
89 |
--- a/dev-python/daiquiri/files/testrepository-0.0.20-test-backport1.patch |
90 |
+++ /dev/null |
91 |
@@ -1,16 +0,0 @@ |
92 |
-From d3d6cac4fd42f2067c0dd81be748853f81c348fc Mon Sep 17 00:00:00 2001 |
93 |
-From: Robert Collins <robertc@×××××××××××××.net> |
94 |
-Date: Sun, 12 Jul 2015 21:37:34 +1200 |
95 |
-Subject: [PATCH] Fix 3.3+ tests with nested classnames. |
96 |
- |
97 |
---- a/testrepository/tests/ui/test_cli.py |
98 |
-+++ b/testrepository/tests/ui/test_cli.py |
99 |
-@@ -157,7 +157,7 @@ def method(self): |
100 |
- self.assertThat(ui._stdout.buffer.getvalue().decode('utf8'), |
101 |
- DocTestMatches("""\ |
102 |
- ====================================================================== |
103 |
--FAIL: testrepository.tests.ui.test_cli.Case.method |
104 |
-+FAIL: testrepository.tests.ui.test_cli...Case.method |
105 |
- ---------------------------------------------------------------------- |
106 |
- ...Traceback (most recent call last):... |
107 |
- File "...test_cli.py", line ..., in method |
108 |
|
109 |
diff --git a/dev-python/daiquiri/files/testrepository-0.0.20-test-backport2.patch b/dev-python/daiquiri/files/testrepository-0.0.20-test-backport2.patch |
110 |
deleted file mode 100644 |
111 |
index 69d591c2f..000000000 |
112 |
--- a/dev-python/daiquiri/files/testrepository-0.0.20-test-backport2.patch |
113 |
+++ /dev/null |
114 |
@@ -1,49 +0,0 @@ |
115 |
-From e2f84ae6b2bcf89221613056d0c45dd308f46d62 Mon Sep 17 00:00:00 2001 |
116 |
-From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= <jelmer@××××××.uk> |
117 |
-Date: Thu, 5 Apr 2018 01:02:40 +0100 |
118 |
-Subject: [PATCH] Fix the testrepository tests with newer versions of |
119 |
- testtools. |
120 |
- |
121 |
---- a/testrepository/tests/commands/test_failing.py |
122 |
-+++ b/testrepository/tests/commands/test_failing.py |
123 |
-@@ -90,7 +90,7 @@ class TestCommand(ResourcedTestCase): |
124 |
- finally: |
125 |
- log.stopTestRun() |
126 |
- self.assertEqual( |
127 |
-- log._events, [ |
128 |
-+ [tuple(ev) for ev in log._events], [ |
129 |
- ('startTestRun',), |
130 |
- ('status', 'failing', 'inprogress', None, True, None, None, False, |
131 |
- None, None, Wildcard), |
132 |
---- a/testrepository/tests/test_repository.py |
133 |
-+++ b/testrepository/tests/test_repository.py |
134 |
-@@ -113,9 +113,10 @@ class FailingCase: |
135 |
- def run(self, result): |
136 |
- result.startTest(self) |
137 |
- result.addError( |
138 |
-- self, None, details={'traceback': content.text_content("")}) |
139 |
-+ self, None, details={'traceback': content.text_content("tb")}) |
140 |
- result.stopTest(self) |
141 |
- |
142 |
-+ |
143 |
- def make_test(id, should_pass): |
144 |
- """Make a test.""" |
145 |
- if should_pass: |
146 |
-@@ -409,7 +410,7 @@ class TestRepositoryContract(ResourcedTestCase): |
147 |
- finally: |
148 |
- log.stopTestRun() |
149 |
- self.assertEqual( |
150 |
-- log._events, [ |
151 |
-+ [tuple(ev) for ev in log._events], [ |
152 |
- ('startTestRun',), |
153 |
- ('status', |
154 |
- 'testrepository.tests.test_repository.Case.method', |
155 |
-@@ -465,7 +466,7 @@ class TestRepositoryContract(ResourcedTestCase): |
156 |
- finally: |
157 |
- log.stopTestRun() |
158 |
- self.assertEqual( |
159 |
-- log._events, |
160 |
-+ [tuple(ev) for ev in log._events], |
161 |
- [ |
162 |
- ('startTestRun',), |
163 |
- ('status', |