fixup! fixup! fixup! CI: Stacktraces of pytest and xdist-workers on timeout

Author: ReinierMaas

libs/opsqueue_python/tests/conftest.py

@@ -17,14 +17,11 @@
 from opsqueue.consumer import Strategy
 
 
-_sigusr1_dump_file: Any | None = None
-
-
 def _stack_dump_path(pid: int) -> Path:
     return Path(f"/tmp/opsqueue-pytest-stack-{pid}.log")
 
 
-def _linux_child_pids(parent_pid: int) -> dict[int, tuple[str, str]]:
+def _linux_descendant_pids(parent_pid: int) -> dict[int, tuple[str, str]]:
     children_file = Path(f"/proc/{parent_pid}/task/{parent_pid}/children")
     try:
         raw = children_file.read_text(encoding="utf-8").strip()
@@ -49,11 +46,14 @@ def _child_command(pid: int) -> tuple[str, str]:
             return ("<comm>", "<cmdline>")
 
     pids = [int(pid_text) for pid_text in raw.split() if pid_text.isdigit()]
-    return {pid: _child_command(pid) for pid in pids}
+    result = {pid: _child_command(pid) for pid in pids}
+    for pid in pids:
+        result.update(_linux_descendant_pids(pid))
+    return result
 
 
 def _handle_sigterm(signum: int, frame: object) -> None:
-    worker_pids = _linux_child_pids(os.getpid())
+    worker_pids = _linux_descendant_pids(os.getpid())
     if worker_pids:
         print(
             f"[opsqueue pytest] Requesting stack dump from child workers: {worker_pids.keys()}",
@@ -122,11 +122,10 @@ def _handle_sigterm(signum: int, frame: object) -> None:
 
 
 # Register signal handlers at module import time (before pytest_configure hook runs).
-_sigusr1_dump_file = _stack_dump_path(os.getpid()).open("w", encoding="utf-8")
 # Make SIGUSR1 print a traceback in any process (controller or worker).
 faulthandler.register(
     signal.SIGUSR1,
-    file=_sigusr1_dump_file,
+    file=_stack_dump_path(os.getpid()).open("w", encoding="utf-8"),
     all_threads=True,
     chain=False,
 )