diff options
| author | Matthew Treinish <mtreinish@kortar.org> | 2021-07-14 09:59:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-14 09:59:36 -0400 |
| commit | b0df5a19fac29752cef7eabae635388aa3a4882b (patch) | |
| tree | b6747b49f9bd2196f42573f42f595fa0fb270f2a /testtools | |
| parent | 2b32f684c1eff4c1bed4b8a3b7bea0de171a16c4 (diff) | |
| parent | 42b21e759dc4f178e52b864104b451ce8054181f (diff) | |
| download | testtools-b0df5a19fac29752cef7eabae635388aa3a4882b.tar.gz | |
Merge branch 'master' into 310_retrocompatibility
Diffstat (limited to 'testtools')
| -rw-r--r-- | testtools/tests/test_testresult.py | 2 | ||||
| -rw-r--r-- | testtools/tests/test_testsuite.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/testtools/tests/test_testresult.py b/testtools/tests/test_testresult.py index 9f107b9..a9db0e2 100644 --- a/testtools/tests/test_testresult.py +++ b/testtools/tests/test_testresult.py @@ -2667,6 +2667,8 @@ class TestNonAsciiResults(TestCase): """Syntax errors should still have fancy special-case formatting""" if platform.python_implementation() == "PyPy": spaces = ' ' + elif sys.version_info >= (3, 10): + spaces = ' ' else: spaces = ' ' textoutput = self._test_external_case("exec ('f(a, b c)')") diff --git a/testtools/tests/test_testsuite.py b/testtools/tests/test_testsuite.py index 7ad5b74..65cb88d 100644 --- a/testtools/tests/test_testsuite.py +++ b/testtools/tests/test_testsuite.py @@ -181,7 +181,7 @@ class TestConcurrentStreamTestSuiteRun(TestCase): 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:] |