GodopuandClaude Opus 5.5
a93c9bf292
test_b13_reexec_preserves_original_argv and test_b13_no_freeze_switch_
disables_reexec ran the checkout's run_loop.sh with --creator, which gets
past argument parsing to mam_acquire_loop_lock on the default marker,
$MAM_REAL_ROOT/.mam/loop-guard-active with MAM_REAL_ROOT = the script's own
checkout. In the main checkout that is the live loop's lock (taken and
released for a moment: a real loop refused, or the test refused); in a review
tree it left an empty .mam. Both now set MAM_LOOP_MARKER under their tmp_path.
A sweep of the 16 modules that use run_loop.sh (a per-test watcher for a new
.mam in the checkout, an empty .mam removed before each test) found only
these two; the others pin MAM_LOOP_MARKER already, end before the lock
(--help, argument errors), or run a copy of the tree.
Tests: test_loop_marker_isolation.py L1 runs every test that reaches the lock
through the checkout's run_loop.sh in a copy of the checkout and requires no
.mam there; W1 of the Issue #17 isolation test now also requires that no .mam
exists (it only looked for files, so the empty lock directory passed it). At
97c2946 both fail.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01HCGpJXhSZasJLU38ksDghe
51 lines
2.6 KiB
Python
51 lines
2.6 KiB
Python
"""Tests never take the loop lock of the checkout they run in.
|
|
|
|
run_loop.sh puts its control root at its own checkout (MAM_REAL_ROOT =
|
|
REPO_ROOT) and takes `${MAM_LOOP_MARKER:-$MAM_REAL_ROOT/.mam/loop-guard-active}`
|
|
once the arguments parse (mam_acquire_loop_lock creates the directory). In the
|
|
main checkout that is the live loop's lock: a test run would take it for a
|
|
moment - refusing a real loop, or being refused by one - and leave `.mam/`
|
|
behind in a review tree. Every test that reaches the lock through the
|
|
checkout's own run_loop.sh therefore names a marker under its tmp_path.
|
|
|
|
L1 copies this checkout and runs those tests there: the copy gets no `.mam`.
|
|
"""
|
|
from __future__ import annotations
|
|
|
|
import os
|
|
import re
|
|
import subprocess
|
|
import sys
|
|
|
|
from test_issue17_workspace_root_isolation import _copy_checkout
|
|
|
|
# every test that runs the checkout's run_loop.sh far enough to take the lock
|
|
# (a sweep of the run_loop.sh users on 97c2946; --help and argument errors
|
|
# end before the lock, copies of the tree and mam_sandbox trees are not the
|
|
# checkout). The first two took the checkout's lock at 97c2946.
|
|
NODES = [
|
|
"tests/test_o3_scoped_guard.py::test_b13_reexec_preserves_original_argv",
|
|
"tests/test_o3_scoped_guard.py::test_b13_no_freeze_switch_disables_reexec",
|
|
"tests/test_issue5_phase3_loop.py::test_p3_02_run_loop_wrapper_delegates_to_python_default",
|
|
"tests/test_issue5_phase3_loop.py::test_p3_02_run_loop_wrapper_rollback_mode",
|
|
"tests/test_loop_cli.py::test_creator_parses_and_reaches_session_check",
|
|
"tests/test_o2_race_free_lock.py::test_o2_12_run_loop_exits_on_lock_failure",
|
|
"tests/test_issue25_plan_reuse.py::test_p7b_the_legacy_shell_loop_refuses_the_option",
|
|
]
|
|
|
|
|
|
def test_l1_no_test_takes_the_loop_lock_of_its_checkout(tmp_path):
|
|
copy = tmp_path / "checkout"
|
|
_copy_checkout(copy)
|
|
assert not (copy / ".mam").exists()
|
|
env = {k: v for k, v in os.environ.items() if not k.startswith(("HERDR_", "MAM_", "MQTT_", "SKS_"))}
|
|
env.update(WORKSPACE_ROOT=str(copy), AGENT_PYTHON_BIN=sys.executable, PYTHONDONTWRITEBYTECODE="1")
|
|
env.pop("PYTHONPATH", None)
|
|
res = subprocess.run([sys.executable, "-m", "pytest", "-p", "no:cacheprovider", "-q",
|
|
f"--basetemp={tmp_path / 'bt'}", *NODES],
|
|
capture_output=True, text=True, cwd=str(copy), env=env, timeout=900)
|
|
assert res.returncode == 0, res.stdout[-3000:] + res.stderr[-2000:]
|
|
summary = res.stdout.strip().splitlines()[-1]
|
|
assert int(re.search(r"(\d+) passed", summary).group(1)) >= len(NODES) and "skipped" not in summary, summary
|
|
assert not (copy / ".mam").exists(), "a test took the checkout's loop lock (its .mam was created)"
|