Force using xdist plugin and fix linting

Author: nicoddemus

src/_pytest/subtests.py

@@ -4,13 +4,13 @@
 from collections.abc import Generator
 from collections.abc import Iterator
 from collections.abc import Mapping
+from contextlib import AbstractContextManager
 from contextlib import contextmanager
 from contextlib import ExitStack
 from contextlib import nullcontext
 import sys
 import time
 from typing import Any
-from typing import ContextManager
 from typing import TYPE_CHECKING
 from unittest import TestCase
 
@@ -23,12 +23,11 @@
 from _pytest.capture import SysCapture
 from _pytest.config import Config
 from _pytest.config import hookimpl
-from _pytest.config import Parser
+from _pytest.config.argparsing import Parser
 from _pytest.fixtures import fixture
 from _pytest.fixtures import SubRequest
 from _pytest.logging import catching_logs
 from _pytest.logging import LogCaptureHandler
-from _pytest.nodes import Item
 from _pytest.reports import TestReport
 from _pytest.runner import CallInfo
 from _pytest.runner import check_interactive_exception
@@ -85,7 +84,7 @@ def sub_test_description(self) -> str:
             parts.append(f"({params_desc})")
         return " ".join(parts) or "(<subtest>)"
 
-    def _to_json(self) -> dict:
+    def _to_json(self) -> dict[str, Any]:
         data = super()._to_json()
         del data["context"]
         data["_report_type"] = "SubTestReport"
@@ -236,11 +235,11 @@ def subtests(request: SubRequest) -> Generator[SubTests, None, None]:
 @attr.s
 class SubTests:
     ihook: pluggy.HookRelay = attr.ib()
-    suspend_capture_ctx: Callable[[], ContextManager] = attr.ib()
+    suspend_capture_ctx: Callable[[], AbstractContextManager[None]] = attr.ib()
     request: SubRequest = attr.ib()
 
     @property
-    def item(self) -> Item:
+    def item(self) -> Any:
         return self.request.node
 
     def test(
@@ -282,7 +281,7 @@ class _SubTestContextManager:
     ihook: pluggy.HookRelay
     msg: str | None
     kwargs: dict[str, Any]
-    suspend_capture_ctx: Callable[[], ContextManager]
+    suspend_capture_ctx: Callable[[], AbstractContextManager[None]]
     request: SubRequest
 
     def __enter__(self) -> None:
@@ -302,8 +301,8 @@ def __enter__(self) -> None:
 
     def __exit__(
         self,
-        exc_type: type[Exception] | None,
-        exc_val: Exception | None,
+        exc_type: type[BaseException] | None,
+        exc_val: BaseException | None,
         exc_tb: TracebackType | None,
     ) -> bool:
         __tracebackhide__ = True
@@ -352,7 +351,7 @@ def make_call_info(
     stop: float,
     duration: float,
     when: Literal["collect", "setup", "call", "teardown"],
-) -> CallInfo:
+) -> CallInfo[Any]:
     return CallInfo(
         None,
         exc_info,

testing/test_subtests.py

@@ -12,9 +12,7 @@
 
 @pytest.mark.parametrize("mode", ["normal", "xdist"])
 class TestFixture:
-    """
-    Tests for ``subtests`` fixture.
-    """
+    """Tests for ``subtests`` fixture."""
 
     @pytest.fixture
     def simple_script(self, pytester: pytest.Pytester) -> None:
@@ -39,7 +37,7 @@ def test_simple_terminal_normal(
         else:
             assert mode == "xdist"
             pytest.importorskip("xdist")
-            result = pytester.runpytest("-n1")
+            result = pytester.runpytest("-n1", "-pxdist.plugin")
             expected_lines = ["1 worker [1 item]"]
 
         expected_lines += [
@@ -69,7 +67,7 @@ def test_simple_terminal_verbose(
         else:
             assert mode == "xdist"
             pytest.importorskip("xdist")
-            result = pytester.runpytest("-n1", "-v")
+            result = pytester.runpytest("-n1", "-v", "-pxdist.plugin")
             expected_lines = [
                 "1 worker [1 item]",
                 "*gw0*100%* test_simple_terminal_verbose.py::test_foo*",
@@ -106,7 +104,7 @@ def test_foo(subtests):
         else:
             assert mode == "xdist"
             pytest.importorskip("xdist")
-            result = pytester.runpytest("-n1")
+            result = pytester.runpytest("-n1", "-pxdist.plugin")
             expected_lines = ["1 worker [1 item]"]
         expected_lines += ["* 1 passed, 3 skipped, 2 subtests passed in *"]
         result.stdout.fnmatch_lines(expected_lines)
@@ -130,7 +128,7 @@ def test_foo(subtests):
         else:
             assert mode == "xdist"
             pytest.importorskip("xdist")
-            result = pytester.runpytest("-n1")
+            result = pytester.runpytest("-n1", "-pxdist.plugin")
             expected_lines = ["1 worker [1 item]"]
         expected_lines += ["* 1 passed, 2 subtests passed, 3 subtests xfailed in *"]
         result.stdout.fnmatch_lines(expected_lines)
@@ -152,7 +150,7 @@ def test_typing_exported(subtests: SubTests) -> None:
         else:
             assert mode == "xdist"
             pytest.importorskip("xdist")
-            result = pytester.runpytest("-n1")
+            result = pytester.runpytest("-n1", "-pxdist.plugin")
             expected_lines = ["1 worker [1 item]"]
         expected_lines += ["* 1 passed *"]
         result.stdout.fnmatch_lines(expected_lines)
@@ -215,9 +213,7 @@ def test_foo(subtests):
 
 
 class TestSubTest:
-    """
-    Test Test.subTest functionality.
-    """
+    """Test.subTest functionality."""
 
     @pytest.fixture
     def simple_script(self, pytester: pytest.Pytester) -> Path:
@@ -264,11 +260,11 @@ def test_simple_terminal_normal(
             else:
                 assert runner == "pytest-xdist"
                 pytest.importorskip("xdist")
-                result = pytester.runpytest(simple_script, "-n1")
+                result = pytester.runpytest(simple_script, "-n1", "-pxdist.plugin")
                 expected_lines = ["1 worker [1 item]"]
             result.stdout.fnmatch_lines(
-                expected_lines
-                + [
+                [
+                    *expected_lines,
                     "* T.test_foo [[]custom[]] (i=1) *",
                     "E  * AssertionError: 1 != 0",
                     "* T.test_foo [[]custom[]] (i=3) *",
@@ -310,16 +306,18 @@ def test_simple_terminal_verbose(
             else:
                 assert runner == "pytest-xdist"
                 pytest.importorskip("xdist")
-                result = pytester.runpytest(simple_script, "-n1", "-v")
+                result = pytester.runpytest(
+                    simple_script, "-n1", "-v", "-pxdist.plugin"
+                )
                 expected_lines = [
                     "1 worker [1 item]",
                     "*gw0*100%* SUBFAIL test_simple_terminal_verbose.py::T::test_foo*",
                     "*gw0*100%* SUBFAIL test_simple_terminal_verbose.py::T::test_foo*",
                     "*gw0*100%* PASSED test_simple_terminal_verbose.py::T::test_foo*",
                 ]
             result.stdout.fnmatch_lines(
-                expected_lines
-                + [
+                [
+                    *expected_lines,
                     "* T.test_foo [[]custom[]] (i=1) *",
                     "E  * AssertionError: 1 != 0",
                     "* T.test_foo [[]custom[]] (i=3) *",
@@ -470,15 +468,19 @@ def test_foo(self):
             result = pytester.runpytest(p, "-v", "-rsf")
             result.stdout.re_match_lines(
                 [
-                    r"test_skip_with_failure.py::T::test_foo \[custom message\] \(i=0\) SUBSKIP \(skip subtest i=0\) .*",
-                    r"test_skip_with_failure.py::T::test_foo \[custom message\] \(i=3\) SUBSKIP \(skip subtest i=3\) .*",
+                    r"test_skip_with_failure.py::T::test_foo \[custom message\] \(i=0\) SUBSKIP"
+                    r" \(skip subtest i=0\) .*",
+                    r"test_skip_with_failure.py::T::test_foo \[custom message\] \(i=3\) SUBSKIP"
+                    r" \(skip subtest i=3\) .*",
                     r"test_skip_with_failure.py::T::test_foo \[custom message\] \(i=4\) SUBFAIL .*",
                     r"test_skip_with_failure.py::T::test_foo \[custom message\] \(i=9\) SUBFAIL .*",
                     "test_skip_with_failure.py::T::test_foo PASSED .*",
                     r"[custom message] (i=0) SUBSKIP [1] test_skip_with_failure.py:5: skip subtest i=0",
                     r"[custom message] (i=0) SUBSKIP [1] test_skip_with_failure.py:5: skip subtest i=3",
-                    r"[custom message] (i=4) SUBFAIL test_skip_with_failure.py::T::test_foo - AssertionError: assert 4 < 4",
-                    r"[custom message] (i=9) SUBFAIL test_skip_with_failure.py::T::test_foo - AssertionError: assert 9 < 4",
+                    r"[custom message] (i=4) SUBFAIL test_skip_with_failure.py::T::test_foo"
+                    r" - AssertionError: assert 4 < 4",
+                    r"[custom message] (i=9) SUBFAIL test_skip_with_failure.py::T::test_foo"
+                    r" - AssertionError: assert 9 < 4",
                     r".* 6 failed, 1 passed, 4 skipped in .*",
                 ]
             )
@@ -542,8 +544,10 @@ def test_foo(self):
                 [
                     r"test_skip_with_failure_and_non_subskip.py::T::test_foo \[custom message\] \(i=4\) SUBFAIL .*",
                     r"test_skip_with_failure_and_non_subskip.py::T::test_foo SKIPPED \(skip the test\)",
-                    r"\[custom message\] \(i=0\) SUBSKIP \[1\] test_skip_with_failure_and_non_subskip.py:5: skip subtest i=3",
-                    r"\[custom message\] \(i=0\) SUBSKIP \[1\] test_skip_with_failure_and_non_subskip.py:5: skip the test",
+                    r"\[custom message\] \(i=0\) SUBSKIP \[1\] test_skip_with_failure_and_non_subskip.py:5:"
+                    r" skip subtest i=3",
+                    r"\[custom message\] \(i=0\) SUBSKIP \[1\] test_skip_with_failure_and_non_subskip.py:5:"
+                    r" skip the test",
                     r"\[custom message\] \(i=4\) SUBFAIL test_skip_with_failure_and_non_subskip.py::T::test_foo",
                     r".* 6 failed, 5 skipped in .*",
                 ]
@@ -555,7 +559,8 @@ def test_foo(self):
                     [
                         r"test_skip_with_failure_and_non_subskip.py::T::test_foo \[custom message\] \(i=4\) SUBFAIL .*",
                         r"test_skip_with_failure_and_non_subskip.py::T::test_foo SKIPPED \(skip the test\).*",
-                        r"\[custom message\] \(i=3\) SUBSKIP test_skip_with_failure_and_non_subskip.py::T::test_foo - Skipped: skip subtest i=3",
+                        r"\[custom message\] \(i=3\) SUBSKIP test_skip_with_failure_and_non_subskip.py::T::test_foo"
+                        r" - Skipped: skip subtest i=3",
                         r"SKIPPED test_skip_with_failure_and_non_subskip.py::T::test_foo - Skipped: skip the test",
                         r"\[custom message\] \(i=4\) SUBFAIL test_skip_with_failure_and_non_subskip.py::T::test_foo",
                         r".* 6 failed, 5 skipped in .*",
@@ -748,9 +753,7 @@ class TestDebugging:
     """Check --pdb support for subtests fixture and TestCase.subTest."""
 
     class _FakePdb:
-        """
-        Fake debugger class implementation that tracks which methods were called on it.
-        """
+        """Fake debugger class implementation that tracks which methods were called on it."""
 
         quitting: bool = False
         calls: list[str] = []
@@ -813,9 +816,7 @@ def runpytest_and_check_pdb(
 
 
 def test_exitfirst(pytester: pytest.Pytester) -> None:
-    """
-    Validate that when passing --exitfirst the test exits after the first failed subtest.
-    """
+    """Validate that when passing --exitfirst the test exits after the first failed subtest."""
     pytester.makepyfile(
         """
         def test_foo(subtests):