pytest-orm-boundaries 0.7.1__tar.gz → 0.7.3__tar.gz

{pytest_orm_boundaries-0.7.1 → pytest_orm_boundaries-0.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytest-orm-boundaries
-Version: 0.7.1
+Version: 0.7.3
 Summary: Pytest plugin that fails tests when ORM queries cross DDD aggregate boundaries (Django supported today).
 Keywords: django,pytest,plugin,orm,ddd,aggregate,boundaries,architecture
 Author: Evgeniia Chibisova

{pytest_orm_boundaries-0.7.1 → pytest_orm_boundaries-0.7.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "pytest-orm-boundaries"
-version = "0.7.1"
+version = "0.7.3"
 description = "Pytest plugin that fails tests when ORM queries cross DDD aggregate boundaries (Django supported today)."
 readme = "README.md"
 requires-python = ">=3.11"
@@ -54,4 +54,4 @@ exclude-newer = "2 weeks"
 testpaths = ["tests"]
 
 [dependency-groups]
-dev = ["django>=4.2"]
+dev = ["django>=4.2", "pytest-xdist>=3.8"]

{pytest_orm_boundaries-0.7.1 → pytest_orm_boundaries-0.7.3}/src/pytest_orm_boundaries/crossings.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from dataclasses import dataclass, field
 from pathlib import Path
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, TypedDict
 
 from pytest_orm_boundaries.callstack import find_frames_inside_project
 
@@ -26,6 +26,24 @@ class CrossingRecord:
     tests: set[str] = field(default_factory=set)
 
 
+class SerializedCrossing(TypedDict):
+    """One crossing encoded using values supported by xdist's worker channel."""
+
+    file: str
+    line_number: int
+    crossed_aggregates: list[str]
+    involved_models: list[str]
+    tests: list[str]
+
+
+class SerializedTrackerState(TypedDict):
+    """All process-local result state that the xdist controller must merge."""
+
+    crossings: list[SerializedCrossing]
+    seen_ignore_patterns: list[str]
+    used_ignore_patterns: list[str]
+
+
 class CrossingTracker:
     """Checks label sets against the aggregate rule and records the crossings,
     skipping allowed and ignored files and naming each crossing's call place and
@@ -137,3 +155,46 @@ class CrossingTracker:
     def find_stale_patterns(self) -> list[str]:
         """Ignore globs whose file ran but never crossed -- safe to delete."""
         return self._ignore_tracker.find_stale_patterns()
+
+    def serialize_state(self) -> SerializedTrackerState:
+        """Encode collected results using only xdist-serializable values."""
+        seen, used = self._ignore_tracker.export_matched_patterns()
+        return {
+            "crossings": [
+                {
+                    "file": crossing.file,
+                    "line_number": crossing.line_number,
+                    "crossed_aggregates": list(crossing.crossed_aggregates),
+                    "involved_models": list(crossing.involved_models),
+                    "tests": sorted(crossing.tests),
+                }
+                for crossing in self.crossings
+            ],
+            "seen_ignore_patterns": sorted(seen),
+            "used_ignore_patterns": sorted(used),
+        }
+
+    def merge_state(self, state: SerializedTrackerState) -> None:
+        """Merge results collected by another process into this tracker."""
+        for crossing in state["crossings"]:
+            crossed = (
+                tuple(crossing["crossed_aggregates"]),
+                tuple(crossing["involved_models"]),
+            )
+            tests = crossing["tests"]
+            if not tests:
+                self.add_record(
+                    call_place=(crossing["file"], crossing["line_number"]),
+                    crossing=crossed,
+                    test=None,
+                )
+            for test in tests:
+                self.add_record(
+                    call_place=(crossing["file"], crossing["line_number"]),
+                    crossing=crossed,
+                    test=test,
+                )
+        self._ignore_tracker.merge_matched_patterns(
+            seen=state["seen_ignore_patterns"],
+            used=state["used_ignore_patterns"],
+        )

{pytest_orm_boundaries-0.7.1 → pytest_orm_boundaries-0.7.3}/src/pytest_orm_boundaries/guard.py

@@ -12,7 +12,7 @@ from functools import wraps
 from pathlib import Path
 from typing import TYPE_CHECKING
 
-from pytest_orm_boundaries.crossings import CrossingTracker
+from pytest_orm_boundaries.crossings import CrossingTracker, SerializedTrackerState
 from pytest_orm_boundaries.model_resolution import resolve_labels
 from pytest_orm_boundaries.prefetch_resolution import resolve_prefetch_step_models
 from pytest_orm_boundaries.sql_parsing import extract_table_names, looks_like_data_query
@@ -158,6 +158,14 @@ class BoundaryGuard:
     def find_stale_patterns(self) -> list[str]:
         return self._tracker.find_stale_patterns()
 
+    def serialize_state(self) -> SerializedTrackerState:
+        """Return process-local results for transport to an xdist controller."""
+        return self._tracker.serialize_state()
+
+    def merge_state(self, state: SerializedTrackerState) -> None:
+        """Merge results received by the xdist controller from one worker."""
+        self._tracker.merge_state(state)
+
     def _handle_query(self, sql: str, vendor: str) -> None:
         """Map one executed data query to its table labels and check them."""
         table_names = extract_table_names(sql, vendor)
@@ -170,7 +178,12 @@ class BoundaryGuard:
         """Map one prefetch to the model pair per relation step and check them."""
         if not model_instances:
             return
-        source_model = type(model_instances[0])
+        from django.db.models import Model
+
+        first = model_instances[0]
+        if not isinstance(first, Model):
+            return
+        source_model = type(first)
         step_model_pairs = resolve_prefetch_step_models(
             source_model=source_model, lookups=lookups
         )

{pytest_orm_boundaries-0.7.1 → pytest_orm_boundaries-0.7.3}/src/pytest_orm_boundaries/ignores.py

@@ -31,5 +31,16 @@ class IgnoreTracker:
     def find_stale_patterns(self) -> list[str]:
         return sorted(self._seen - self._used)
 
+    def export_matched_patterns(self) -> tuple[set[str], set[str]]:
+        """Return copies of the patterns seen and used during this run."""
+        return set(self._seen), set(self._used)
+
+    def merge_matched_patterns(
+        self, *, seen: Iterable[str], used: Iterable[str]
+    ) -> None:
+        """Merge ignore activity collected by another process."""
+        self._seen.update(seen)
+        self._used.update(used)
+
     def _find_matching_patterns(self, file_paths: Iterable[str]) -> set[str]:
         return {p for f in file_paths for p in self._patterns if fnmatch(f, p)}

{pytest_orm_boundaries-0.7.1 → pytest_orm_boundaries-0.7.3}/src/pytest_orm_boundaries/plugin.py

@@ -20,6 +20,7 @@ from pytest_orm_boundaries.ignores import IgnoreTracker
 
 config_path_key = pytest.StashKey[Path | None]()
 guard_key = pytest.StashKey["BoundaryGuard"]()
+worker_output_key = "pytest_orm_boundaries"
 
 
 class BoundariesConfigWarning(UserWarning):
@@ -120,10 +121,25 @@ def pytest_runtest_protocol(item: pytest.Item, nextitem: pytest.Item | None):
 def pytest_sessionfinish(session: pytest.Session, exitstatus: int) -> None:
     """A clean-but-violating run must still fail the run (via the exit code)."""
     guard = _installed_guard(session.config)
-    if guard is not None and guard.crossings and exitstatus == pytest.ExitCode.OK:
+    if guard is None:
+        return
+    if hasattr(session.config, "workerinput"):
+        session.config.workeroutput[worker_output_key] = guard.serialize_state()
+        return
+    if guard.crossings and exitstatus == pytest.ExitCode.OK:
         session.exitstatus = pytest.ExitCode.TESTS_FAILED
 
 
+@pytest.hookimpl(optionalhook=True)
+def pytest_testnodedown(node, error) -> None:
+    """Merge one xdist worker's results into the controller's guard."""
+    guard = _installed_guard(node.config)
+    worker_output = getattr(node, "workeroutput", {})
+    state = worker_output.get(worker_output_key)
+    if guard is not None and state is not None:
+        guard.merge_state(state)
+
+
 def pytest_terminal_summary(
     terminalreporter: pytest.TerminalReporter,
     exitstatus: int,