Compare commits

..
3 Commits
Author SHA1 Message Date
jpmschweitzer 5d5b033749 fix(permissions): narrow rm -rf deny globs to their exact forms
The trailing wildcard on the three rm -rf deny entries spanned path
separators, so Bash(rm -rf /*) matched every absolute path on the
machine rather than the filesystem root, and the ~ and $HOME entries
had the same shape. Narrowed to the exact literal forms.

These rules match literal command text, so they still stop a typo on
rm -rf /, rm -rf ~ or rm -rf $HOME exactly, but they no longer stop a
recursive delete aimed at any other path. That reduced cover is
deliberate, not an oversight.
2026-08-25 20:31:17 +02:00
jpmschweitzerandClaude 748d1cbfae 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 <noreply@anthropic.com>
2026-08-18 15:40:41 +02:00
jpmschweitzerandClaude a9a5731991 build(setup): prove the venv works instead of trusting pip's exit code
`make setup` exited 0 whether or not the environment it produced was
usable — per D-24, a step whose job is to not fail has a passing state
indistinguishable from its broken state. Adds two cheap checks at the
end: `pip check` for version drift between installed packages, and
`pytest --collect-only` to walk the full src/ import graph and catch a
missing declared dependency, which is what core-api's undetected
missing sqlalchemy looked like (T-47). Neither needs any of the five
backing services running — dependencies.py only constructs clients
inside lru_cache getters, never at import/collection time.

Also fixes `setup` to install requirements-dev.txt rather than
requirements.txt. It only ever installed the latter since the
Makefile's introduction, so `make test` and `make lint` — both of
which need pytest and ruff — were never actually reachable from a
clean `make setup`. requirements-dev.txt pulls in requirements.txt via
-r, so the runtime set installed is unchanged; only the tooling to
prove it is added. Found because the new check failed honestly on its
first clean-tree run, before this fix.

Verified: clean-tree run installs everything and passes (455 tests
collected); a second run is a fast no-op; uninstalling a declared
runtime dependency (asyncpg) makes the check fail with
ModuleNotFoundError, and rerunning setup restores and re-passes it.

Co-Authored-By: Claude <noreply@anthropic.com>
2026-08-17 12:06:08 +02:00
4 changed files with 64 additions and 6 deletions
+3 -3
View File
@@ -59,9 +59,9 @@
"Bash(redis-cli * FLUSHDB*)",
"Bash(redis-cli FLUSHALL*)",
"Bash(redis-cli FLUSHDB*)",
"Bash(rm -rf $HOME*)",
"Bash(rm -rf /*)",
"Bash(rm -rf ~*)",
"Bash(rm -rf $HOME)",
"Bash(rm -rf /)",
"Bash(rm -rf ~)",
"Bash(su *)",
"Bash(sudo *)",
"Bash(toj)",
+51 -3
View File
@@ -18,19 +18,67 @@ help: ## Show this help
| awk 'BEGIN{FS=":.*?## "}{printf " \033[36m%-14s\033[0m %s\n", $$1, $$2}'
.PHONY: setup
setup: ## Create the venv and install dependencies
setup: ## Create the venv, install dependencies, and prove the result works
$(PYTHON) -m venv .venv
$(VENV)/bin/pip install -r requirements.txt
# requirements-dev.txt pulls in requirements.txt via -r, so this is still
# the full runtime set plus pytest/ruff. Installing only requirements.txt
# here (as this line originally did) left `make test` and `make lint`
# unreachable from a clean `make setup` since the Makefile's introduction
# in b9f55cb — pytest was never installed by setup at all. Found by the
# check below failing on its first clean-tree run; fixed in the same
# commit rather than filed separately, since the new check cannot pass
# honestly against the old line.
$(VENV)/bin/pip install -r requirements-dev.txt
# Exit 0 from pip install is not evidence (D-24) — it is the same exit code
# whether requirements.txt matches what's on disk or a dependency silently
# failed to install. Two cheap checks, for two different drift modes:
# pip check - installed packages satisfy each other's declared
# version constraints (a stale/partial install).
# pytest --collect-only - every test module actually imports, which
# walks the full src/ import graph and is exactly
# what catches a *missing* declared dependency
# (core-api's sqlalchemy case in T-47). It builds
# no client and opens no socket - dependencies.py
# wraps client construction in lru_cache getters,
# never called at collection time - so this needs
# none of the five backing services running.
$(VENV)/bin/pip check
$(VENV)/bin/python -m pytest tests/ --collect-only -q
.PHONY: run
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; }
+3
View File
@@ -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."""
+7
View File
@@ -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"