restore(main): долить фантомные ORCH-022/059/066/068 (4 потерянных PR) #71

Merged
admin merged 39 commits from integ/restore-main-2026-06-08 into main 2026-06-08 09:57:18 +03:00
Showing only changes of commit 04233cb3c8 - Show all commits

View File

@@ -158,13 +158,19 @@ def test_tc16_fail_rolls_back_and_enqueues_developer(monkeypatch):
# ---------------------------------------------------------------------------
# TC-17 — the rollback task_desc carries the verbatim findings (ORCH-046).
# ---------------------------------------------------------------------------
def test_tc17_task_desc_has_verbatim_findings(monkeypatch):
def test_tc17_task_desc_has_verbatim_findings(monkeypatch, tmp_path):
"""TC-17: the re-launched developer's task_desc embeds the verbatim finding
substance (not just a link), following the ORCH-046 pattern."""
reason = "2 secret(s): aws-access-key in src/config.py:12"
_qg_with_security(monkeypatch, _fail(reason))
task_id = _make_task("deploy-staging", repo="enduro-trails")
# Isolate the worktree base under tmp_path so this test never touches the real
# shared /repos/_wt host path (PermissionError in CI). Mirrors the pattern in
# tests/test_git_worktree.py / test_merge_gate.py.
from src import git_worktree
monkeypatch.setattr(git_worktree.settings, "worktrees_dir", str(tmp_path / "_wt"))
# Seed a real 17-security-report.md in the worktree so extract_security_findings
# has a verbatim body to excerpt.
wt = stage_engine.get_worktree_path("enduro-trails", _BRANCH)