From 4365dfd0c206caf0819bb61c78d4c51ff0a4b90a Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Sun, 26 Sep 2021 20:44:21 +0200 Subject: [PATCH] dev-python/pifpaf/files: remove wrong patches Signed-off-by: Alessandro Barbieri --- .../testrepository-0.0.20-test-backport.patch | 62 ------------------- ...testrepository-0.0.20-test-backport1.patch | 16 ----- ...testrepository-0.0.20-test-backport2.patch | 49 --------------- 3 files changed, 127 deletions(-) delete mode 100644 dev-python/pifpaf/files/testrepository-0.0.20-test-backport.patch delete mode 100644 dev-python/pifpaf/files/testrepository-0.0.20-test-backport1.patch delete mode 100644 dev-python/pifpaf/files/testrepository-0.0.20-test-backport2.patch diff --git a/dev-python/pifpaf/files/testrepository-0.0.20-test-backport.patch b/dev-python/pifpaf/files/testrepository-0.0.20-test-backport.patch deleted file mode 100644 index d7ab87c066..0000000000 --- a/dev-python/pifpaf/files/testrepository-0.0.20-test-backport.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 8f8ab15fafdad6db850c84772323b32375b09285 Mon Sep 17 00:00:00 2001 -From: Robert Collins -Date: Tue, 10 Mar 2015 15:21:49 +1300 -Subject: [PATCH] Fixup tests with latest testtools. - -Testtools has started chunking exceptions (which is perhaps good, -perhaps bad) - but we shouldn't depend on the exact behaviour in it -for our tests. ---- a/NEWS -+++ b/NEWS -@@ -5,6 +5,12 @@ testrepository release notes - NEXT (In development) - +++++++++++++++++++++ - -+CHANGES -+------- -+ -+* Isolate the testrepository test suite from the chunking (or otherwise) -+ behaviour of testtools' exception handlers. (Robert Collins) -+ - 0.0.20 - ++++++ - ---- a/testrepository/tests/test_repository.py -+++ b/testrepository/tests/test_repository.py -@@ -28,6 +28,7 @@ - from testresources import TestResource - from testtools import ( - clone_test_with_new_id, -+ content, - PlaceHolder, - ) - import testtools -@@ -103,19 +104,24 @@ class Case(ResourcedTestCase): - def passing(self): - pass - -- def failing(self): -- self.fail("oops") -- - def unexpected_success(self): - self.expectFailure("unexpected success", self.assertTrue, True) - - -+class FailingCase: -+ -+ def run(self, result): -+ result.startTest(self) -+ result.addError( -+ self, None, details={'traceback': content.text_content("")}) -+ result.stopTest(self) -+ - def make_test(id, should_pass): - """Make a test.""" - if should_pass: - case = Case("passing") - else: -- case = Case("failing") -+ case = FailingCase() - return clone_test_with_new_id(case, id) - - diff --git a/dev-python/pifpaf/files/testrepository-0.0.20-test-backport1.patch b/dev-python/pifpaf/files/testrepository-0.0.20-test-backport1.patch deleted file mode 100644 index 655d2c3e79..0000000000 --- a/dev-python/pifpaf/files/testrepository-0.0.20-test-backport1.patch +++ /dev/null @@ -1,16 +0,0 @@ -From d3d6cac4fd42f2067c0dd81be748853f81c348fc Mon Sep 17 00:00:00 2001 -From: Robert Collins -Date: Sun, 12 Jul 2015 21:37:34 +1200 -Subject: [PATCH] Fix 3.3+ tests with nested classnames. - ---- a/testrepository/tests/ui/test_cli.py -+++ b/testrepository/tests/ui/test_cli.py -@@ -157,7 +157,7 @@ def method(self): - self.assertThat(ui._stdout.buffer.getvalue().decode('utf8'), - DocTestMatches("""\ - ====================================================================== --FAIL: testrepository.tests.ui.test_cli.Case.method -+FAIL: testrepository.tests.ui.test_cli...Case.method - ---------------------------------------------------------------------- - ...Traceback (most recent call last):... - File "...test_cli.py", line ..., in method diff --git a/dev-python/pifpaf/files/testrepository-0.0.20-test-backport2.patch b/dev-python/pifpaf/files/testrepository-0.0.20-test-backport2.patch deleted file mode 100644 index 69d591c2f2..0000000000 --- a/dev-python/pifpaf/files/testrepository-0.0.20-test-backport2.patch +++ /dev/null @@ -1,49 +0,0 @@ -From e2f84ae6b2bcf89221613056d0c45dd308f46d62 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= -Date: Thu, 5 Apr 2018 01:02:40 +0100 -Subject: [PATCH] Fix the testrepository tests with newer versions of - testtools. - ---- a/testrepository/tests/commands/test_failing.py -+++ b/testrepository/tests/commands/test_failing.py -@@ -90,7 +90,7 @@ class TestCommand(ResourcedTestCase): - finally: - log.stopTestRun() - self.assertEqual( -- log._events, [ -+ [tuple(ev) for ev in log._events], [ - ('startTestRun',), - ('status', 'failing', 'inprogress', None, True, None, None, False, - None, None, Wildcard), ---- a/testrepository/tests/test_repository.py -+++ b/testrepository/tests/test_repository.py -@@ -113,9 +113,10 @@ class FailingCase: - def run(self, result): - result.startTest(self) - result.addError( -- self, None, details={'traceback': content.text_content("")}) -+ self, None, details={'traceback': content.text_content("tb")}) - result.stopTest(self) - -+ - def make_test(id, should_pass): - """Make a test.""" - if should_pass: -@@ -409,7 +410,7 @@ class TestRepositoryContract(ResourcedTestCase): - finally: - log.stopTestRun() - self.assertEqual( -- log._events, [ -+ [tuple(ev) for ev in log._events], [ - ('startTestRun',), - ('status', - 'testrepository.tests.test_repository.Case.method', -@@ -465,7 +466,7 @@ class TestRepositoryContract(ResourcedTestCase): - finally: - log.stopTestRun() - self.assertEqual( -- log._events, -+ [tuple(ev) for ev in log._events], - [ - ('startTestRun',), - ('status',