Files
cc-ci/tests/unit/test_discovery.py
autonomic-bot 5741e8838f fix(2): F2-1 — test_custom_tests_repo_local_gated uses synthetic recipe (Adversary cold)
The Phase-1e HC2 test asserted custom_tests('custom-html', repo-local) == [] when only the
repo-local dir was set + custom-html had no cc-ci-side functional tests. Phase-2 commit bec9265
added 4 legitimate non-lifecycle test_*.py files under tests/custom-html/{functional,playwright}/
which custom_tests() now correctly returns — breaking the == [] assertion.

The custom_tests behavior is correct; the test fixture was using the real recipe name. Fix: switch
to a synthetic recipe + monkeypatch cc_ci_dir (same pattern already used in the Phase-2 sibling
test_discovery_phase2.py). 5-line change, no behavior change.

Cold-verifiable on cc-ci: cc-ci-run -m pytest tests/unit -v -> 21 passed in 5.38s
(Adversary's F2-1 repro now PASSes; no other regression).

Also: tests/n8n/PARITY.md drafted for the in-flight Q1.2 work (n8n parity port).

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-28 06:32:47 +01:00

131 lines
6.0 KiB
Python

"""Unit tests for overlay/custom/hook discovery + precedence (Phase 1d DG4 + Phase 1e HC2/HC3).
Deterministic, no deployment. Proves:
- the overlay resolution rule (repo-local > cc-ci) + the generic floor (HC3: additive, separate);
- the HC2 repo-local approval gate (default-deny; repo-local consulted only for approved recipes).
Run with: `cc-ci-run -m pytest tests/unit`. These live under tests/unit/ (NOT a recipe name, NOT
tests/_generic/) so the run orchestrator never picks them up as overlays/custom tests."""
import os
import sys
sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "..", "runner"))
from harness import discovery # noqa: E402
def _approve(tmp_path, *recipes):
"""Point the allowlist at a temp file approving the given recipes (HC2), and return a cleanup."""
f = tmp_path / "approved.txt"
f.write_text("".join(f"{r}\n" for r in recipes))
os.environ["CCCI_REPO_LOCAL_APPROVED_FILE"] = str(f)
def teardown_function():
os.environ.pop("CCCI_REPO_LOCAL_APPROVED_FILE", None)
# ---- HC3: generic is the floor; overlay resolution is separate + additive --------------------
def test_no_overlay_means_generic_floor():
# hedgedoc ships no tests/hedgedoc/ overlay and no repo-local -> no overlay; generic floor exists
assert discovery.resolve_overlay_op("hedgedoc", "install", None) is None
src, path = discovery.generic_op("install")
assert src == "generic"
assert path == os.path.join(discovery.GENERIC_DIR, "test_install.py")
# back-compat resolver still yields generic when there is no overlay
assert discovery.resolve_op("hedgedoc", "install", None) == ("generic", path)
def test_cc_ci_overlay_found_for_each_op():
# custom-html ships cc-ci overlays for all four ops -> resolve_overlay_op returns the cc-ci file
for op in discovery.LIFECYCLE_OPS:
res = discovery.resolve_overlay_op("custom-html", op, None)
assert res == (
"cc-ci",
os.path.join(discovery.cc_ci_dir("custom-html"), f"test_{op}.py"),
), op
# ---- HC2: repo-local approval gate (default-deny) --------------------------------------------
def test_repo_local_ignored_when_not_approved(tmp_path):
# default-deny: a repo-local overlay is NOT consulted for an unapproved recipe -> cc-ci wins
_approve(tmp_path) # empty allowlist
(tmp_path / "test_install.py").write_text("# repo-local overlay\n")
res = discovery.resolve_overlay_op("custom-html", "install", str(tmp_path))
assert res == ("cc-ci", os.path.join(discovery.cc_ci_dir("custom-html"), "test_install.py"))
assert discovery.repo_local_approved("custom-html") is False
def test_repo_local_wins_when_approved(tmp_path):
# approved: repo-local is upstream-authoritative and beats cc-ci for the same op
rl = tmp_path / "repo"
rl.mkdir()
(rl / "test_install.py").write_text("# repo-local overlay\n")
_approve(tmp_path, "custom-html")
assert discovery.repo_local_approved("custom-html") is True
res = discovery.resolve_overlay_op("custom-html", "install", str(rl))
assert res == ("repo-local", str(rl / "test_install.py"))
def test_custom_tests_repo_local_gated(tmp_path, monkeypatch):
# non-lifecycle test_*.py from repo-local only count for approved recipes; lifecycle names excluded
# Use a synthetic recipe name + monkeypatched cc_ci_dir so this is independent of what
# tests/<real-recipe>/ ships (Phase-2 custom-html now also ships functional/ + playwright/,
# which would legitimately appear in custom_tests for "custom-html" — F2-1).
fake_recipe = "ccci-hc2-fixture"
monkeypatch.setattr(discovery, "cc_ci_dir", lambda r: str(tmp_path / "cc-ci" / r))
(tmp_path / "cc-ci" / fake_recipe).mkdir(parents=True)
rl = tmp_path / "repo"
rl.mkdir()
(rl / "test_sso.py").write_text("# repo-local custom\n")
(rl / "test_install.py").write_text("# lifecycle name -> excluded from custom\n")
_approve(tmp_path) # not approved -> repo-local custom ignored
assert discovery.custom_tests(fake_recipe, str(rl)) == []
_approve(tmp_path, fake_recipe) # approved -> repo-local custom honored
customs = discovery.custom_tests(fake_recipe, str(rl))
names = {(src, os.path.basename(p)) for src, p in customs}
assert ("repo-local", "test_sso.py") in names
assert all(os.path.basename(p) != "test_install.py" for _, p in customs)
def test_install_steps_repo_local_gated(tmp_path):
rl = tmp_path / "repo"
rl.mkdir()
(rl / "install_steps.sh").write_text("#!/usr/bin/env bash\n")
_approve(tmp_path) # not approved -> repo-local hook ignored (custom-html has no cc-ci hook)
assert discovery.install_steps("custom-html", str(rl)) is None
_approve(tmp_path, "custom-html") # approved -> repo-local hook honored
hook = discovery.install_steps("custom-html", str(rl))
assert hook == ("repo-local", str(rl / "install_steps.sh"))
assert discovery.install_steps("hedgedoc", None) is None
def test_pre_op_hook_repo_local_gated(tmp_path):
# hedgedoc has no cc-ci ops.py, so this isolates the repo-local gate (custom-html now ships a
# real cc-ci tests/custom-html/ops.py, which would mask the gate).
rl = tmp_path / "repo"
rl.mkdir()
(rl / "ops.py").write_text("def pre_upgrade(domain, meta):\n pass\n")
_approve(tmp_path) # not approved -> repo-local ops.py ignored (no cc-ci ops.py either)
assert discovery.pre_op_hook("hedgedoc", "upgrade", str(rl)) is None
_approve(tmp_path, "hedgedoc") # approved -> repo-local pre-op hook honored
hook = discovery.pre_op_hook("hedgedoc", "upgrade", str(rl))
assert hook == ("repo-local", str(rl / "ops.py"))
# an ops.py that does NOT define pre_<op> is not a hook for that op
assert discovery.pre_op_hook("hedgedoc", "backup", str(rl)) is None
def test_default_allowlist_is_empty():
# the checked-in tests/repo-local-approved.txt approves nothing (default-deny invariant)
os.environ.pop("CCCI_REPO_LOCAL_APPROVED_FILE", None)
assert discovery.approved_recipes() == set()