claude-bot
aff334e82b
Root-cause fix for main erosion (phantom merge): code of ORCH-067/069 reached `done` while absent from origin/main (only their auto docs-PRs landed). - FR-1: verify_merged_to_main confirms merge ONLY by `git merge-base --is-ancestor <validated_sha> origin/main`; the OR-branch pr_already_merged is removed (a merged PR no longer confirms). Empty SHA / git error -> False. - FR-2: pr_already_merged demoted to merge_pr idempotency-guard; counts a PR only when merged & head.ref==<branch> & base.ref=="main" (explicit in-loop filter). - FR-3: merge_pr selects the open code-PR by head==<branch> AND base==main. - FR-5: new deterministic check_main_regression in _handle_merge_verify (after confirmed SHA-in-main, before done) verifies MAIN_REGRESSION_MARKERS still in origin/main; deterministic count==0 -> alert "main regressed" + HOLD (NOT done, no rollback); git error of the grep -> fail-open. Kill-switch ORCH_REGRESSION_GUARD_ENABLED; non-self -> no-op. - FR-4: root .gitattributes `CHANGELOG.md merge=union` so Unreleased edits auto-merge on rebase without conflict (branch not rolled back). Invariants unchanged (STAGE_TRANSITIONS, QG_CHECKS, deploy-status, merge-gate, image-freshness, DB schema, external HTTP API); non-self repos no-op (INV-5); never-raise (INV-1); merge only via Gitea PR-API (INV-2). Docs: CHANGELOG, .env.example (README/ADR updated by architect). Tests: tests/test_orch073_*.py (TC-01..18); existing merge-gate tests updated for the new code-PR filter. Refs: ORCH-073 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
102 lines
5.3 KiB
Python
102 lines
5.3 KiB
Python
"""Global pytest fixtures.
|
|
|
|
test(conftest): mute Telegram in ALL tests to stop prod leakage.
|
|
|
|
Background: a pytest run on prod was sending REAL Telegram messages to Slava,
|
|
because some tests (e.g. test_webhook_dedup advancing a stage) reach
|
|
notify_stage_change -> send_telegram, which reads the live .env
|
|
telegram_bot_token/chat_id and actually POSTs to Telegram.
|
|
|
|
This autouse fixture stubs send_telegram to a no-op for every test:
|
|
|
|
- "src.notifications.send_telegram" is the SOURCE. All the notify_* helpers in
|
|
notifications.py call the module-global send_telegram, and every other module
|
|
that does a *local* `from .notifications import send_telegram` inside a
|
|
function resolves it live at call time -> covered by patching the source.
|
|
|
|
- "src.stage_engine.send_telegram" is patched too, because stage_engine binds
|
|
send_telegram as a MODULE-LEVEL name (from .notifications import send_telegram
|
|
at import), so a patch of the source alone would not intercept its 3 direct
|
|
calls. webhooks/plane and launcher import it locally inside functions, so the
|
|
source patch already covers them; they are patched defensively with
|
|
raising=False anyway in case that ever changes.
|
|
|
|
raising=False so a module that doesn't (yet) expose the name never breaks setup.
|
|
"""
|
|
|
|
import pytest
|
|
|
|
|
|
@pytest.fixture(autouse=True)
|
|
def _no_telegram(monkeypatch):
|
|
_noop = lambda *a, **k: None # noqa: E731
|
|
# Source of truth (covers notifications.notify_* and all local re-imports).
|
|
monkeypatch.setattr("src.notifications.send_telegram", _noop, raising=False)
|
|
# Module-level binding in stage_engine (and defensive coverage elsewhere).
|
|
monkeypatch.setattr("src.stage_engine.send_telegram", _noop, raising=False)
|
|
monkeypatch.setattr("src.webhooks.plane.send_telegram", _noop, raising=False)
|
|
monkeypatch.setattr("src.agents.launcher.send_telegram", _noop, raising=False)
|
|
monkeypatch.setattr("src.queue_worker.send_telegram", _noop, raising=False)
|
|
# ORCH-053: the reconciler binds send_telegram as a MODULE-LEVEL name
|
|
# (from .notifications import send_telegram), so the source patch alone would
|
|
# not intercept its unblock notification — patch it here too.
|
|
monkeypatch.setattr("src.reconciler.send_telegram", _noop, raising=False)
|
|
yield
|
|
|
|
|
|
@pytest.fixture(autouse=True)
|
|
def _reset_webhook_secrets(monkeypatch):
|
|
"""Isolate settings singleton between test files (CI cross-file isolation).
|
|
|
|
settings is a process-wide Pydantic singleton read once at import. Different
|
|
test modules set env variables differently at import-time, so those values leak
|
|
across files when pytest collects them together (as CI does).
|
|
|
|
1. webhook secrets: reset to "" so HMAC is disabled by default. Tests that
|
|
intentionally test the 401 path (test_webhook_dedup.py:268,278) re-apply
|
|
their own monkeypatch AFTER this autouse fixture runs, which overrides the
|
|
reset for the duration of that one test only.
|
|
|
|
2. db_path: reset to the value from ORCH_DB_PATH env var (last written by the
|
|
last imported test module). Without this, test_webhook_dedup.py (imported
|
|
first, alphabetically) seeds settings.db_path = dedup.db, while
|
|
test_webhooks.py's setup_db fixture tries to remove test_orchestrator.db,
|
|
leaving the DB dirty across tests that share a branch name and causing
|
|
get_task_by_repo_branch() to return a stale row with the wrong stage.
|
|
Per-test monkeypatches in test_webhook_dedup.setup_db override this reset.
|
|
"""
|
|
import os
|
|
from src.webhooks import gitea as gitea_mod
|
|
from src.webhooks import plane as plane_mod
|
|
from src import db as db_mod
|
|
monkeypatch.setattr(gitea_mod.settings, "gitea_webhook_secret", "", raising=False)
|
|
monkeypatch.setattr(plane_mod.settings, "plane_webhook_secret", "", raising=False)
|
|
db_path_env = os.environ.get("ORCH_DB_PATH", "")
|
|
if db_path_env:
|
|
monkeypatch.setattr(db_mod.settings, "db_path", db_path_env, raising=False)
|
|
yield
|
|
|
|
|
|
@pytest.fixture(autouse=True)
|
|
def _disable_merge_verify(monkeypatch):
|
|
"""ORCH-071: disable the merge-verify under-gate by default in ALL tests.
|
|
|
|
The under-gate (deploy -> done) runs a deterministic merge-actor + a
|
|
post-deploy merge verification that make REAL Gitea/git calls. Leaving it ON
|
|
by default would (a) reach the network from unrelated deploy->done tests and
|
|
(b) make them pass/fail by ACCIDENT depending on whether the live Gitea still
|
|
has the historical PR merged (a hidden CI flake). We therefore default it to
|
|
its documented kill-switch OFF state (``merge_verify_enabled=False`` == 1:1
|
|
pre-ORCH-071 behaviour). Tests that specifically target the under-gate
|
|
(test_merge_verify / test_deploy_finalizer_merge_gate / test_merge_actor /
|
|
test_deploy_restart_merge_recovery) re-enable it via their own monkeypatch
|
|
AFTER this autouse fixture, scoping the feature ON to just those tests.
|
|
"""
|
|
from src import config as _cfg
|
|
monkeypatch.setattr(_cfg.settings, "merge_verify_enabled", False, raising=False)
|
|
# ORCH-073: the regression guard (check_main_regression) runs real git in
|
|
# _handle_merge_verify's confirmed branch. Default it OFF too so unrelated
|
|
# deploy->done tests stay 1:1; the dedicated ORCH-073 tests re-enable it.
|
|
monkeypatch.setattr(_cfg.settings, "regression_guard_enabled", False, raising=False)
|
|
yield
|