Merge pull request #8054 from hroncok/4.6-py3.10

[4.6] testing: python 3.10 fix
2020-11-25 08:50:54 -03:00 · 2020-11-25 08:50:54 -03:00 · da7ca9e732
parent be26da84f4 90aaeebc8e
commit da7ca9e732
1 changed files with 3 additions and 1 deletions
--- a/testing/test_runner.py
+++ b/testing/test_runner.py
@ -336,8 +336,10 @@ class BaseFunctionalTests(object):
        assert reps[2].failed
        assert reps[2].when == "teardown"
        assert reps[2].longrepr.reprcrash.message in (
-            # python3 error
+            # python3 < 3.10 error
            "TypeError: teardown_method() missing 2 required positional arguments: 'y' and 'z'",
+            # python3 >= 3.10 error
+            "TypeError: TestClass.teardown_method() missing 2 required positional arguments: 'y' and 'z'",
            # python2 error
            "TypeError: teardown_method() takes exactly 4 arguments (2 given)",
        )