Merge branch 'main' into 13737-require-unique-paramset-ids

Author: gomri15

doc/en/getting-started.rst

@@ -73,7 +73,7 @@ The ``[100%]`` refers to the overall progress of running all test cases. After i
 Run multiple tests
 ----------------------------------------------------------
 
-``pytest`` will run all files of the form test_*.py or \*_test.py in the current directory and its subdirectories. More generally, it follows :ref:`standard test discovery rules <test discovery>`.
+``pytest`` will run all files of the form ``test_*.py`` or ``*_test.py`` in the current directory and its subdirectories. More generally, it follows :ref:`standard test discovery rules <test discovery>`.
 
 
 Assert that a certain exception is raised

testing/test_unittest.py

@@ -1322,10 +1322,12 @@ def test_async_support(pytester: Pytester) -> None:
     reprec.assertoutcome(failed=1, passed=2)
 
 
+@pytest.mark.skipif(
+    sys.version_info >= (3, 11), reason="asynctest is not compatible with Python 3.11+"
+)
 def test_asynctest_support(pytester: Pytester) -> None:
     """Check asynctest support (#7110)"""
     pytest.importorskip("asynctest")
-
     pytester.copy_example("unittest/test_unittest_asynctest.py")
     reprec = pytester.inline_run()
     reprec.assertoutcome(failed=1, passed=2)