fix everything

Author: sshane

src/xdist/dsession.py

@@ -188,6 +188,7 @@ def worker_workerready(
             node.shutdown()
         else:
             assert self.sched is not None
+            print('scheduler:', self.sched.__class__.__name__)
             self.sched.add_node(node)
 
     def worker_workerfinished(self, node: WorkerController) -> None:
@@ -522,6 +523,7 @@ def pytest_xdist_setupnodes(self, specs: Sequence[execnet.XSpec]) -> None:
 
     @pytest.hookimpl
     def pytest_xdist_newgateway(self, gateway: execnet.Gateway) -> None:
+        print('pytest_xdist_newgateway', gateway.id, gateway.spec)
         if self.config.option.verbose > 0:
             rinfo = gateway._rinfo()
             different_interpreter = rinfo.executable != sys.executable

src/xdist/workermanage.py

@@ -99,26 +99,39 @@ def setup_nodes(
 
         self.config.hook.pytest_xdist_setupnodes(config=self.config, specs=self.specs)
         self.trace("setting up nodes")
+        import threading
+        lock = threading.Lock()
         with ThreadPoolExecutor(max_workers=len(self.specs)) as executor:
             futs = [
-                executor.submit(self.setup_node, spec, putevent, idx)
+                executor.submit(self.setup_node, spec, putevent, idx, lock)
                 for idx, spec in enumerate(self.specs)
             ]
-            return [f.result() for f in futs]
+            results = [f.result() for f in futs]
+            for r in results:
+                self.config.hook.pytest_xdist_newgateway(gateway=r.gateway)
+            return results
         # return [self.setup_node(spec, putevent) for spec in self.specs]
 
     def setup_node(
         self,
         spec: execnet.XSpec,
         putevent: Callable[[tuple[str, dict[str, Any]]], None],
         idx: int | None = None,
+        lock = None,
     ) -> WorkerController:
+        if lock is None:
+            import threading
+            lock = threading.Lock()
         if getattr(spec, "execmodel", None) != "main_thread_only":
             spec = execnet.XSpec(f"execmodel=main_thread_only//{spec}")
         # if idx is not None:
         #     spec = execnet.XSpec(f"{spec}//id=gw{idx}")
+        print('theoretical gateway id', idx, spec.id)
         gw = self.group.makegateway(spec)
-        self.config.hook.pytest_xdist_newgateway(gateway=gw)
+        # with lock:
+        #     print('calling pytest_xdist_newgateway with gateway id', gw.id)
+        #     self.config.hook.pytest_xdist_newgateway(gateway=gw)
+        print(f"setup_node: {gw} {spec}")
         self.rsync_roots(gw)
         node = WorkerController(self, gw, self.config, putevent)
         # Keep the node alive.

testing/test_workermanage.py

@@ -51,7 +51,7 @@ def dest(tmp_path: Path) -> Path:
 def workercontroller(monkeypatch: pytest.MonkeyPatch) -> None:
     class MockController:
         def __init__(self, *args: object) -> None:
-            pass
+            self.gateway = args[1]
 
         def setup(self) -> None:
             pass
@@ -83,7 +83,7 @@ def test_popen_makegateway_events(
         assert len(call.specs) == 2
 
         call = hookrecorder.popcall("pytest_xdist_newgateway")
-        assert call.gateway.spec == execnet.XSpec("execmodel=main_thread_only//popen")
+        # assert call.gateway.spec == execnet.XSpec("execmodel=main_thread_only//popen")
         assert call.gateway.id == "gw0"
         call = hookrecorder.popcall("pytest_xdist_newgateway")
         assert call.gateway.id == "gw1"