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

[4.6] testing: python 3.10 fix
cielavenir · Nov 25, 2020 · da7ca9e · da7ca9e
2 parents be26da8 + 90aaeeb
commit da7ca9e
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/testing/test_runner.py b/testing/test_runner.py
@@ -336,8 +336,10 @@ def test_method(self):
         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)",
         )