Refactor xdist integration

Author: dmtucker

src/pytest_mypy.py

@@ -59,38 +59,28 @@ def pytest_addoption(parser):
     )
 
 
-XDIST_WORKERINPUT_ATTRIBUTE_NAMES = (
-    "workerinput",
-    # xdist < 2.0.0:
-    "slaveinput",
-)
+def _xdist_worker(config):
+    try:
+        return {"input": _xdist_workerinput(config)}
+    except AttributeError:
+        return {}
 
 
-def _get_xdist_workerinput(config_node):
-    workerinput = None
-    for attr_name in XDIST_WORKERINPUT_ATTRIBUTE_NAMES:
-        workerinput = getattr(config_node, attr_name, None)
-        if workerinput is not None:
-            break
-    return workerinput
-
-
-def _is_xdist_controller(config):
-    """
-    True if the code running the given pytest.config object is running in
-    an xdist controller node or not running xdist at all.
-    """
-    return _get_xdist_workerinput(config) is None
+def _xdist_workerinput(node):
+    try:
+        return node.workerinput
+    except AttributeError:  # compat xdist < 2.0
+        return node.slaveinput
 
 
 class MypyXdistControllerPlugin:
     """A plugin that is only registered on xdist controller processes."""
 
     def pytest_configure_node(self, node):
         """Pass the config stash to workers."""
-        _get_xdist_workerinput(node)["mypy_config_stash_serialized"] = (
-            node.config.stash[stash_key["config"]].serialized()
-        )
+        _xdist_workerinput(node)["mypy_config_stash_serialized"] = node.config.stash[
+            stash_key["config"]
+        ].serialized()
 
 
 def pytest_configure(config):
@@ -99,7 +89,7 @@ def pytest_configure(config):
     register a custom marker for MypyItems,
     and configure the plugin based on the CLI.
     """
-    if _is_xdist_controller(config):
+    if not _xdist_worker(config):
         config.pluginmanager.register(MypyReportingPlugin())
 
         # Get the path to a temporary file and delete it.
@@ -281,11 +271,12 @@ def from_mypy(
     @classmethod
     def from_session(cls, session) -> "MypyResults":
         """Load (or generate) cached mypy results for a pytest session."""
-        if _is_xdist_controller(session.config):
+        xdist_worker = _xdist_worker(session.config)
+        if not xdist_worker:
             mypy_config_stash = session.config.stash[stash_key["config"]]
         else:
             mypy_config_stash = MypyConfigStash.from_serialized(
-                _get_xdist_workerinput(session.config)["mypy_config_stash_serialized"]
+                xdist_worker["input"]["mypy_config_stash_serialized"]
             )
         mypy_results_path = mypy_config_stash.mypy_results_path
         with FileLock(str(mypy_results_path) + ".lock"):

tox.ini

@@ -3,23 +3,23 @@
 minversion = 4.4
 isolated_build = true
 envlist =
-    py37-pytest{7.0, 7.x}-mypy{1.0, 1.x}
-    py38-pytest{7.0, 7.x, 8.0, 8.x}-mypy{1.0, 1.x}
-    py39-pytest{7.0, 7.x, 8.0, 8.x}-mypy{1.0, 1.x}
-    py310-pytest{7.0, 7.x, 8.0, 8.x}-mypy{1.0, 1.x}
-    py311-pytest{7.0, 7.x, 8.0, 8.x}-mypy{1.0, 1.x}
-    py312-pytest{7.0, 7.x, 8.0, 8.x}-mypy{1.0, 1.x}
+    py37-pytest{7.0, 7.x}-mypy{1.0, 1.x}-xdist{1.x, 2.0, 2.x, 3.0, 3.x}
+    py38-pytest{7.0, 7.x, 8.0, 8.x}-mypy{1.0, 1.x}-xdist{1.x, 2.0, 2.x, 3.0, 3.x}
+    py39-pytest{7.0, 7.x, 8.0, 8.x}-mypy{1.0, 1.x}-xdist{1.x, 2.0, 2.x, 3.0, 3.x}
+    py310-pytest{7.0, 7.x, 8.0, 8.x}-mypy{1.0, 1.x}-xdist{1.x, 2.0, 2.x, 3.0, 3.x}
+    py311-pytest{7.0, 7.x, 8.0, 8.x}-mypy{1.0, 1.x}-xdist{1.x, 2.0, 2.x, 3.0, 3.x}
+    py312-pytest{7.0, 7.x, 8.0, 8.x}-mypy{1.0, 1.x}-xdist{1.x, 2.0, 2.x, 3.0, 3.x}
     publish
     static
 
 [gh-actions]
 python =
-    3.7: py37-pytest{7.0, 7.x}-mypy{1.0, 1.x}
-    3.8: py38-pytest{7.0, 7.x, 8.0, 8.x}-mypy{1.0, 1.x}, publish, static
-    3.9: py39-pytest{7.0, 7.x, 8.0, 8.x}-mypy{1.0, 1.x}
-    3.10: py310-pytest{7.0, 7.x, 8.0, 8.x}-mypy{1.0, 1.x}
-    3.11: py311-pytest{7.0, 7.x, 8.0, 8.x}-mypy{1.0, 1.x}
-    3.12: py312-pytest{7.0, 7.x, 8.0, 8.x}-mypy{1.0, 1.x}
+    3.7: py37-pytest{7.0, 7.x}-mypy{1.0, 1.x}-xdist{1.x, 2.0, 2.x, 3.0, 3.x}
+    3.8: py38-pytest{7.0, 7.x, 8.0, 8.x}-mypy{1.0, 1.x}-xdist{1.x, 2.0, 2.x, 3.0, 3.x}, publish, static
+    3.9: py39-pytest{7.0, 7.x, 8.0, 8.x}-mypy{1.0, 1.x}-xdist{1.x, 2.0, 2.x, 3.0, 3.x}
+    3.10: py310-pytest{7.0, 7.x, 8.0, 8.x}-mypy{1.0, 1.x}-xdist{1.x, 2.0, 2.x, 3.0, 3.x}
+    3.11: py311-pytest{7.0, 7.x, 8.0, 8.x}-mypy{1.0, 1.x}-xdist{1.x, 2.0, 2.x, 3.0, 3.x}
+    3.12: py312-pytest{7.0, 7.x, 8.0, 8.x}-mypy{1.0, 1.x}-xdist{1.x, 2.0, 2.x, 3.0, 3.x}
 
 [testenv]
 constrain_package_deps = true
@@ -30,11 +30,15 @@ deps =
     pytest8.x: pytest ~= 8.0
     mypy1.0: mypy ~= 1.0.0
     mypy1.x: mypy ~= 1.0
+    xdist1.x: pytest-xdist ~= 1.0
+    xdist2.0: pytest-xdist ~= 2.0.0
+    xdist2.x: pytest-xdist ~= 2.0
+    xdist3.0: pytest-xdist ~= 3.0.0
+    xdist3.x: pytest-xdist ~= 3.0
 
     packaging ~= 21.3
     pytest-cov ~= 4.1.0
     pytest-randomly ~= 3.4
-    pytest-xdist ~= 1.34
 
 commands = pytest -p no:mypy {posargs:--cov pytest_mypy --cov-branch --cov-fail-under 100 --cov-report term-missing -n auto}