From 748d1cbfae0c8a80999879a4d9a186af5a717ddb Mon Sep 17 00:00:00 2001 From: Jeroen Schweitzer Date: Tue, 18 Aug 2026 15:40:41 +0200 Subject: [PATCH] test(integration): mark the 20 tests that need Neo4j and give them a runnable home D-26 requires `make test` to pass with no network; T-55's audit measured 426 passed/29 skipped with network vs. 412 passed/23 skipped/20 ERRORS inside an unprivileged network namespace. All 20 errors trace to a real Bolt connection opened at fixture setup (neo4j_client -> client.connect()), not to test logic. The ticket's own summary said all 20 were in test_entity_linking.py; tracing the actual error list showed only 5 were (TestEntityLinkingIntegration, TestEntityLinkingMultiTenancy, plus the trailing module-level cleanup test). The other 15 are every test in test_hybrid_rag.py, whose hybrid_rag_service fixture resolves graph_service -> neo4j_client regardless of what the test body itself exercises -- including the RRF-fusion and context-formatting classes that read as pure logic. There is no unit/integration split inside that file without restructuring its fixture graph, which is out of scope here; the whole module is marked instead of picking classes apart from underneath a shared fixture chain. The fix is the mechanism this repo already had and had never wired to a target: tests/conftest.py's `integration` pytest marker plus its RUN_INTEGRATION_TESTS/TEST_TENANT gate (test_integration.py, test_tenant_isolation_live.py, test_quality_report_live.py and TestWikiChangeListenerIntegration already used it). Applying the same marker here means `make test` skips these 20 the same way it already skipped the other 23 -- no file move, no new fixture layer, matching repo precedent exactly rather than inventing a second convention beside it. `make test-integration` is the D-26 home: sets RUN_INTEGRATION_TESTS=1, selects `-m integration`, and treats pytest's own "no tests collected" exit code (5) as a hard failure rather than a pass, so a marker that gets renamed or lost fails loudly instead of the target quietly collecting zero and going green. Verified (unshare -rn sh -c 'ip link set lo up; ...' after confirming the positive control -- a live :8089 returning HTTP 200 outside returns curl exit 7 inside): make test, no network: 412 passed, 43 skipped, exit 0 (was 20 ERRORS) make test, with network: 412 passed, 43 skipped, exit 0 (unchanged; the 14 of these 20 that were previously counted in the 426 passed now skip by default -- reclassified, not lost; the other 6 already skipped for an unrelated reason before this change) make test-integration, these 20, with network: 14 passed, 6 skipped (test_wiki_page's own pytest.skip when it can't create a wiki page -- a pre-existing soft-skip, unrelated to this change), 0 failed, exit 0 make test-integration mutated to select a nonexistent marker: FAIL, "selected 0 tests", exit 2 -- confirmed loud, then reverted Not fixed here: the other 23 tests already carrying `integration` include three files (test_integration.py, test_tenant_isolation_live.py, test_quality_report_live.py) that fail under `make test-integration` today because they call the local dev server on :8778, which was not running in this session -- a pre-existing "never proven runnable" gap this same ticket family exists to find, but a different set of tests than the one measured here. Co-Authored-By: Claude --- Makefile | 27 ++++++++++++++++++++++++++- tests/test_entity_linking.py | 3 +++ tests/test_hybrid_rag.py | 7 +++++++ 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9629771..daae7e6 100644 --- a/Makefile +++ b/Makefile @@ -50,10 +50,35 @@ run: ## Dev server on :8778 with reload (8089 is the container, not this) ./wakeup.sh .PHONY: test -test: ## Run the test suite +test: ## Run the test suite (no network needed — live tests are marked and self-skip) @test -x $(VENV)/bin/python || { echo "FAIL — no venv; run: make setup"; exit 69; } $(VENV)/bin/python -m pytest tests/ +# The `integration` marker and its RUN_INTEGRATION_TESTS/TEST_TENANT gate already +# lived in tests/conftest.py before T-55 (see test_integration.py, +# test_tenant_isolation_live.py, test_quality_report_live.py, and the +# TestWikiChangeListenerIntegration class) — `make test` never ran them because +# `pytest_collection_modifyitems` skips anything carrying the marker unless +# RUN_INTEGRATION_TESTS=1. That gate made them silent under `make test`, but +# nothing ran them WITH the flag set either, so "runnable" had never been +# reasserted. This target is that home (D-26): it sets the flag, selects the +# marker, and — the part that matters — fails loudly if selection ever drops to +# zero, since a target that passes by collecting nothing is worse than one that +# needs a network (T-55). +.PHONY: test-integration +test-integration: ## Live tests against neo4j/qdrant/wikijs/searxng/ollama (needs network + services) + @test -x $(VENV)/bin/python || { echo "FAIL — no venv; run: make setup"; exit 69; } + @$(VENV)/bin/python -m pytest tests/ -m integration --collect-only -q >/dev/null 2>&1; \ + rc=$$?; \ + if [ "$$rc" = "5" ]; then \ + echo "FAIL test-integration — selected 0 tests (marker renamed, moved, or lost — this is a defect, not a pass)"; \ + exit 1; \ + elif [ "$$rc" != "0" ]; then \ + echo "FAIL test-integration — collection errored (rc=$$rc)"; \ + exit $$rc; \ + fi + RUN_INTEGRATION_TESTS=1 $(VENV)/bin/python -m pytest tests/ -m integration -v + .PHONY: lint lint: ## ruff check over the sources @test -x $(VENV)/bin/ruff || { echo "FAIL — ruff not installed; run: make setup"; exit 69; } diff --git a/tests/test_entity_linking.py b/tests/test_entity_linking.py index 406c646..21ad40c 100644 --- a/tests/test_entity_linking.py +++ b/tests/test_entity_linking.py @@ -285,6 +285,7 @@ class TestAddEntityLinksToContent: # Integration Tests - Full Entity Linking Flow # ============================================================================ +@pytest.mark.integration class TestEntityLinkingIntegration: """Test full entity linking flow.""" @@ -421,6 +422,7 @@ class TestEntityLinkingIntegration: # Multi-Tenancy Tests # ============================================================================ +@pytest.mark.integration class TestEntityLinkingMultiTenancy: """Test multi-tenancy isolation in entity linking.""" @@ -464,6 +466,7 @@ class TestEntityLinkingMultiTenancy: # Cleanup # ============================================================================ +@pytest.mark.integration @pytest.mark.asyncio async def test_cleanup_entity_linking_test_data(neo4j_client): """Clean up all test data created by entity linking tests.""" diff --git a/tests/test_hybrid_rag.py b/tests/test_hybrid_rag.py index 5f6eb5f..3fa76d7 100644 --- a/tests/test_hybrid_rag.py +++ b/tests/test_hybrid_rag.py @@ -32,6 +32,13 @@ from src.services.graph_service import GraphService from src.models.hybrid_rag import HybridRAGConfig from src.config import get_settings +# Every test in this module goes through hybrid_rag_service -> graph_service -> +# neo4j_client, which opens a real Bolt connection at fixture setup (T-55/D-26). +# There is no unit/integration split within the file: even the fusion/formatting +# classes that look like pure logic still resolve the full fixture chain, so the +# whole module is marked rather than picking classes apart from underneath. +pytestmark = pytest.mark.integration + # Test user to isolate test data TEST_USER = "llm-tester"