From a15b0fa6d2302d3ef86ddedb1857d4742b6af0dd Mon Sep 17 00:00:00 2001
From: kerry <kerry@berri.ai>
Date: Sat, 19 Sep 2026 00:54:45 +0000
Subject: [PATCH] test(integration): tidy xdist collection bookkeeping

Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
---
 tests/integration/conftest.py | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py
index f66ff7e74df..c54197c15e6 100644
--- a/tests/integration/conftest.py
+++ b/tests/integration/conftest.py
@@ -1,21 +1,20 @@
 from __future__ import annotations
 
-import json
 import hashlib
+import json
 import os
-from collections.abc import Sequence
-from collections.abc import Iterator
+from collections.abc import Iterator, Sequence
 from importlib.metadata import version
 from pathlib import Path
 from typing import Final
 
-import pytest
 import httpx
+import pytest
 from redis import Redis
 
 from tests.integration._support.client import Gateway, eventually, gateway_from_environment
-from tests.integration._support.manifest import OWNED_DIRECTORIES, contracts
 from tests.integration._support.generation import LIFECYCLE_SETTINGS
+from tests.integration._support.manifest import OWNED_DIRECTORIES, contracts
 
 COLLECTED: Final = pytest.StashKey[tuple[str, ...]]()
 REPORTS: Final = pytest.StashKey[list[pytest.TestReport]]()
@@ -41,14 +40,12 @@ class IntegrationReportPlugin:
 
     @pytest.hookimpl(optionalhook=True)
     def pytest_xdist_node_collection_finished(self, node: object, ids: Sequence[str]) -> None:
-        owned_prefix: Final = "tests/integration/"
-        self.config.stash[COLLECTED] = tuple(
-            nodeid
-            for nodeid in ids
-            if nodeid.split("::", 1)[0].startswith(owned_prefix)
-            and len(Path(nodeid.split("::", 1)[0]).parts) > 2
-            and Path(nodeid.split("::", 1)[0]).parts[2] in OWNED_DIRECTORIES
-        )
+        self.config.stash[COLLECTED] = tuple(nodeid for nodeid in ids if _owned(nodeid))
+
+
+def _owned(nodeid: str) -> bool:
+    parts: Final = Path(nodeid.split("::", 1)[0]).parts
+    return parts[:2] == ("tests", "integration") and len(parts) > 3 and parts[2] in OWNED_DIRECTORIES
 
 
 def pytest_collection_modifyitems(config: pytest.Config, items: list[pytest.Item]) -> None: