diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-07-08 15:03:58 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-07-08 15:03:58 +0100 |
commit | 814f4cf860e299a046b649eaee5463427984c09c (patch) | |
tree | 74c45f097899310e599dad6b8df5b63e0f085bc0 /dev-python/testtools/files | |
parent | 7f0ccc917c7abe6223784c703d86cd14755691fb (diff) |
gentoo resync : 08.07.2021
Diffstat (limited to 'dev-python/testtools/files')
-rw-r--r-- | dev-python/testtools/files/testtools-2.4.0-assertitemsequal.patch | 27 | ||||
-rw-r--r-- | dev-python/testtools/files/testtools-2.4.0-py310.patch | 43 |
2 files changed, 70 insertions, 0 deletions
diff --git a/dev-python/testtools/files/testtools-2.4.0-assertitemsequal.patch b/dev-python/testtools/files/testtools-2.4.0-assertitemsequal.patch new file mode 100644 index 000000000000..e46bf29c8bfc --- /dev/null +++ b/dev-python/testtools/files/testtools-2.4.0-assertitemsequal.patch @@ -0,0 +1,27 @@ +From 2ead7c11a54b0860e02992212e302c4a7bd26c35 Mon Sep 17 00:00:00 2001 +From: Matthew Treinish <mtreinish@kortar.org> +Date: Wed, 8 Jul 2020 14:22:24 -0400 +Subject: [PATCH] Update testtools/testcase.py + +Co-authored-by: Thomas Grainger <tagrain@gmail.com> +--- + testtools/testcase.py | 1 + + 1 file changed, 1 insertion(+) + +Rebased for 2.4.0 by Michał Górny (eliminating intermediate commits). + +diff --git a/testtools/testcase.py b/testtools/testcase.py +index bff5be2..22e9143 100644 +--- a/testtools/testcase.py ++++ b/testtools/testcase.py +@@ -501,6 +501,7 @@ class TestCase(unittest.TestCase): + if mismatch_error is not None: + raise mismatch_error + ++ assertItemsEqual = unittest.TestCase.assertCountEqual + def addDetailUniqueName(self, name, content_object): + """Add a detail to the test, but ensure it's name is unique. + +-- +2.32.0 + diff --git a/dev-python/testtools/files/testtools-2.4.0-py310.patch b/dev-python/testtools/files/testtools-2.4.0-py310.patch new file mode 100644 index 000000000000..d2d0c092d14a --- /dev/null +++ b/dev-python/testtools/files/testtools-2.4.0-py310.patch @@ -0,0 +1,43 @@ +From d528842b99b16efce212e15dae3f0a54927d06d8 Mon Sep 17 00:00:00 2001 +From: Cyril Roelandt <cyril@redhat.com> +Date: Fri, 19 Mar 2021 02:50:13 +0000 +Subject: [PATCH] Fix tests with Python 3.10 + +In Python 3, error messages have become a bit more precise. For +instance, the following code snippet: + +---- +class Foo(): + def bar(self, a): + pass + +try: + Foo().bar(1, 2) +except TypeError as e: + print(e) +---- + +will return: + +- in Python 3.9: "bar() takes 2 positional arguments but 3 were given" +- in Python 3.10: "Foo.bar() takes 2 positional arguments but 3 were + given" + +Fix our tests accordingly. +--- + testtools/tests/test_testsuite.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/testtools/tests/test_testsuite.py b/testtools/tests/test_testsuite.py +index 7ad5b74d..65cb88d7 100644 +--- a/testtools/tests/test_testsuite.py ++++ b/testtools/tests/test_testsuite.py +@@ -181,7 +181,7 @@ def run(self): + test.run(process_result) + """, doctest.ELLIPSIS)) + self.assertThat(events[3][6].decode('utf8'), DocTestMatches("""\ +-TypeError: run() takes ...1 ...argument...2...given... ++TypeError: ...run() takes ...1 ...argument...2...given... + """, doctest.ELLIPSIS)) + events = [event[0:10] + (None,) for event in events] + events[1] = events[1][:6] + (None,) + events[1][7:] |