xstress: fix for fixtured tests with a workaround (until xdist PR#1091 is merged)

Author: yuvalino

pytest_xstress.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import functools
 from itertools import chain
 
 import pytest
@@ -191,6 +192,26 @@ def pytest_xdist_make_scheduler(config: pytest.Config, log):
     raise ValueError(f'xstress does not support "{dist}" distmode')
 
 
+@pytest.hookimpl
+def pytest_plugin_registered(plugin, manager: pytest.PytestPluginManager):
+    """Workaround until PR#1091 in pytest-xdist is merged"""
+    if type(plugin).__name__ == "WorkerInteractor":
+        # NOTE: Haven't found a better way to get config at this time
+        if not plugin.config.getvalue("xstress"):
+            return
+
+        # Switch `nextitem=item` to `nextitem=None` when calling `pytest_runtest_protocol`
+        func = plugin.config.hook.pytest_runtest_protocol
+
+        @functools.wraps(func)
+        def wrapper(item, nextitem, *args, **kwargs):
+            if item == nextitem:
+                nextitem = None
+            func(item=item, nextitem=nextitem, *args, **kwargs)
+
+        plugin.config.hook.pytest_runtest_protocol = wrapper
+
+
 @pytest.hookimpl()
 def pytest_addoption(parser: pytest.Parser):
     parser.addoption(

test.py

@@ -387,3 +387,39 @@ def _predicate():
         assert (
             count >= 25
         )  # since 200 tests are run, this should always be true mathematically
+
+
+@pytest.fixture
+def regfix():
+    return 5
+
+
+@pytest.mark.xdist_group(name="f")
+@pytest.mark.regfixture
+def _test_regfixture(regfix):
+    pass
+
+
+def test_regfixture():
+    datas = list()
+    lock = threading.Lock()
+
+    def _on_update(x):
+        with lock:
+            datas.append(x)
+
+    def _predicate():
+        with lock:
+            return len(datas) > 10
+
+    with run_tests(
+        _on_update, "regfixture", "-n2", "--dist", "loadgroup", "--xstress"
+    ) as p:
+        assert wait_until(_predicate)
+        p.kill()
+        p.wait()
+
+    worker = datas[0]["xdist_worker"]
+    assert worker
+    for x in datas:
+        assert x["result"] == "pass"