Merge pull request #9673 from nicoddemus/backport-9511

nicoddemus · web-flow · commit 591d476f14e3 · 2022-02-11T12:45:35.000-03:00
[7.0.x] Enable testing with Python 3.11 (#9511)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -37,6 +37,7 @@ jobs:
           "windows-py38",
           "windows-py39",
           "windows-py310",
+          "windows-py311",
 
           "ubuntu-py36",
           "ubuntu-py37",
@@ -45,6 +46,7 @@ jobs:
           "ubuntu-py38",
           "ubuntu-py39",
           "ubuntu-py310",
+          "ubuntu-py311",
           "ubuntu-pypy3",
 
           "macos-py37",
@@ -81,6 +83,10 @@ jobs:
             python: "3.10"
             os: windows-latest
             tox_env: "py310-xdist"
+          - name: "windows-py311"
+            python: "3.11-dev"
+            os: windows-latest
+            tox_env: "py311"
 
           - name: "ubuntu-py36"
             python: "3.6"
@@ -111,6 +117,10 @@ jobs:
             python: "3.10"
             os: ubuntu-latest
             tox_env: "py310-xdist"
+          - name: "ubuntu-py311"
+            python: "3.11-dev"
+            os: ubuntu-latest
+            tox_env: "py311"
           - name: "ubuntu-pypy3"
             python: "pypy-3.7"
             os: ubuntu-latest
diff --git a/testing/test_assertion.py b/testing/test_assertion.py
@@ -1616,7 +1616,7 @@ def test_raise_assertion_error():
     )
 
 
-def test_raise_assertion_error_raisin_repr(pytester: Pytester) -> None:
+def test_raise_assertion_error_raising_repr(pytester: Pytester) -> None:
     pytester.makepyfile(
         """
         class RaisingRepr(object):
@@ -1627,9 +1627,15 @@ def test_raising_repr():
     """
     )
     result = pytester.runpytest()
-    result.stdout.fnmatch_lines(
-        ["E       AssertionError: <unprintable AssertionError object>"]
-    )
+    if sys.version_info >= (3, 11):
+        # python 3.11 has native support for un-str-able exceptions
+        result.stdout.fnmatch_lines(
+            ["E       AssertionError: <exception str() failed>"]
+        )
+    else:
+        result.stdout.fnmatch_lines(
+            ["E       AssertionError: <unprintable AssertionError object>"]
+        )
 
 
 def test_issue_1944(pytester: Pytester) -> None:
diff --git a/testing/test_compat.py b/testing/test_compat.py
@@ -1,4 +1,5 @@
 import enum
+import sys
 from functools import partial
 from functools import wraps
 from typing import TYPE_CHECKING
@@ -91,6 +92,7 @@ def foo(x):
     assert get_real_func(partial(foo)) is foo
 
 
+@pytest.mark.skipif(sys.version_info >= (3, 11), reason="couroutine removed")
 def test_is_generator_asyncio(pytester: Pytester) -> None:
     pytester.makepyfile(
         """
diff --git a/testing/test_doctest.py b/testing/test_doctest.py
@@ -1,4 +1,5 @@
 import inspect
+import sys
 import textwrap
 from pathlib import Path
 from typing import Callable
@@ -200,6 +201,7 @@ def test_doctest_unexpected_exception(self, pytester: Pytester):
                 "Traceback (most recent call last):",
                 '  File "*/doctest.py", line *, in __run',
                 "    *",
+                *((" *^^^^*",) if sys.version_info >= (3, 11) else ()),
                 '  File "<doctest test_doctest_unexpected_exception.txt[1]>", line 1, in <module>',
                 "ZeroDivisionError: division by zero",
                 "*/test_doctest_unexpected_exception.txt:2: UnexpectedException",
diff --git a/testing/test_main.py b/testing/test_main.py
@@ -1,6 +1,7 @@
 import argparse
 import os
 import re
+import sys
 from pathlib import Path
 from typing import Optional
 
@@ -44,16 +45,32 @@ def pytest_internalerror(excrepr, excinfo):
         assert result.ret == ExitCode.INTERNAL_ERROR
     assert result.stdout.lines[0] == "INTERNALERROR> Traceback (most recent call last):"
 
+    end_lines = (
+        result.stdout.lines[-4:]
+        if sys.version_info >= (3, 11)
+        else result.stdout.lines[-3:]
+    )
+
     if exc == SystemExit:
-        assert result.stdout.lines[-3:] == [
+        assert end_lines == [
             f'INTERNALERROR>   File "{c1}", line 4, in pytest_sessionstart',
             'INTERNALERROR>     raise SystemExit("boom")',
+            *(
+                ("INTERNALERROR>     ^^^^^^^^^^^^^^^^^^^^^^^^",)
+                if sys.version_info >= (3, 11)
+                else ()
+            ),
             "INTERNALERROR> SystemExit: boom",
         ]
     else:
-        assert result.stdout.lines[-3:] == [
+        assert end_lines == [
             f'INTERNALERROR>   File "{c1}", line 4, in pytest_sessionstart',
             'INTERNALERROR>     raise ValueError("boom")',
+            *(
+                ("INTERNALERROR>     ^^^^^^^^^^^^^^^^^^^^^^^^",)
+                if sys.version_info >= (3, 11)
+                else ()
+            ),
             "INTERNALERROR> ValueError: boom",
         ]
     if returncode is False:
diff --git a/testing/test_pytester.py b/testing/test_pytester.py
@@ -743,8 +743,8 @@ def test_run_result_repr() -> None:
 
     # known exit code
     r = pytester_mod.RunResult(1, outlines, errlines, duration=0.5)
-    assert (
-        repr(r) == "<RunResult ret=ExitCode.TESTS_FAILED len(stdout.lines)=3"
+    assert repr(r) == (
+        f"<RunResult ret={str(pytest.ExitCode.TESTS_FAILED)} len(stdout.lines)=3"
         " len(stderr.lines)=4 duration=0.50s>"
     )
 
diff --git a/tox.ini b/tox.ini
@@ -9,6 +9,7 @@ envlist =
     py38
     py39
     py310
+    py311
     pypy3
     py37-{pexpect,xdist,unittestextras,numpy,pluggymain}
     doctesting

Original file line number	Diff line number	Diff line change
`@@ -743,8 +743,8 @@ def test_run_result_repr() -> None:`
`743`	`743`
`744`	`744`	`# known exit code`
`745`	`745`	`r = pytester_mod.RunResult(1, outlines, errlines, duration=0.5)`
`746`		`- assert (`
`747`		`- repr(r) == "<RunResult ret=ExitCode.TESTS_FAILED len(stdout.lines)=3"`
	`746`	`+ assert repr(r) == (`
	`747`	`+ f"<RunResult ret={str(pytest.ExitCode.TESTS_FAILED)} len(stdout.lines)=3"`
`748`	`748`	`" len(stderr.lines)=4 duration=0.50s>"`
`749`	`749`	`)`
`750`	`750`