From cefebd764318f6fbe3098cfd5657ce577ccf7bd0 Mon Sep 17 00:00:00 2001
From: Jason Walker <913443@dadeschools.net>
Date: Wed, 8 Jul 2026 02:35:13 -0400
Subject: [PATCH] test: seed review workflow load and pass expected_head_sha in
 legacy test fixtures

---
 tests/test_audit.py                     | 4 ++++
 tests/test_mcp_server.py                | 3 ++-
 tests/test_permission_reports.py        | 4 ++++
 tests/test_terminal_review_hard_stop.py | 9 +++++++++
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/tests/test_audit.py b/tests/test_audit.py
index 2d3a1e9..a44885a 100644
--- a/tests/test_audit.py
+++ b/tests/test_audit.py
@@ -294,9 +294,13 @@ class TestGatedToolAudit(_AuditWiringBase):
         super().setUp()
         from tests.test_mcp_server import _init_reviewer_session, _install_owned_reviewer_lease
         import reviewer_pr_lease
+        import review_workflow_boundary
+        import review_workflow_load
 
         # Session init clears any prior session lease (#407) and loads workflow (#389).
         _init_reviewer_session("prgs")
+        self.addCleanup(review_workflow_load.clear_review_workflow_load)
+        self.addCleanup(review_workflow_boundary.clear_pre_review_commands)
         self._lease_patch = _install_owned_reviewer_lease(8)
         self._lease_patch.start()
         self._auth_identity_patch = patch(
diff --git a/tests/test_mcp_server.py b/tests/test_mcp_server.py
index d5a5035..7e6dda2 100644
--- a/tests/test_mcp_server.py
+++ b/tests/test_mcp_server.py
@@ -1057,7 +1057,8 @@ class TestMergePR(unittest.TestCase):
                "GITEA_ALLOWED_OPERATIONS": "read,merge"}
         with patch.dict(os.environ, env, clear=True):
             r = gitea_merge_pr(
-                pr_number=8, confirmation=self._confirm(8), remote="prgs")
+                pr_number=8, confirmation=self._confirm(8), remote="prgs",
+                expected_head_sha=new_sha)
         self.assertFalse(r["performed"])
         self.assertTrue(r.get("approval_visible"))
         self.assertFalse(r.get("approval_at_current_head"))
diff --git a/tests/test_permission_reports.py b/tests/test_permission_reports.py
index 2978af5..b06e416 100644
--- a/tests/test_permission_reports.py
+++ b/tests/test_permission_reports.py
@@ -95,8 +95,12 @@ class PermissionReportBase(unittest.TestCase):
         self._dir = tempfile.TemporaryDirectory()
         self.config_path = os.path.join(self._dir.name, "profiles.json")
         self._write_config(CONFIG)
+        import review_workflow_load
+        review_workflow_load.record_review_workflow_load(mcp_server.PROJECT_ROOT)
 
     def tearDown(self):
+        import review_workflow_load
+        review_workflow_load.clear_review_workflow_load()
         self._remotes.stop()
         mcp_server._IDENTITY_CACHE.clear()
         mcp_server.review_workflow_load.clear_review_workflow_load()
diff --git a/tests/test_terminal_review_hard_stop.py b/tests/test_terminal_review_hard_stop.py
index 2a7b45a..07edd98 100644
--- a/tests/test_terminal_review_hard_stop.py
+++ b/tests/test_terminal_review_hard_stop.py
@@ -36,10 +36,13 @@ def _lock(mutations=None, correction=False):
 
 
 def _seed(mutations=None, correction=False):
+    import review_workflow_load
+    review_workflow_load.record_review_workflow_load(mcp_server.PROJECT_ROOT)
     mcp_server._save_review_decision_lock(_lock(mutations, correction))
     mcp_server.gitea_load_review_workflow()
 
 
+
 APPROVED_A = {"pr_number": 5, "action": "approve", "review_id": 1,
               "review_state": "approve"}
 RC_A = {"pr_number": 5, "action": "request_changes", "review_id": 2,
@@ -94,6 +97,8 @@ class TestTerminalHardStopReasons(unittest.TestCase):
 
 class TestMergeHardStopWiring(unittest.TestCase):
     def tearDown(self):
+        import review_workflow_load
+        review_workflow_load.clear_review_workflow_load()
         mcp_server._save_review_decision_lock(None)
         mcp_server.review_workflow_load.clear_review_workflow_load()
 
@@ -116,6 +121,8 @@ class TestMergeHardStopWiring(unittest.TestCase):
 
 class TestMarkFinalHardStopWiring(unittest.TestCase):
     def tearDown(self):
+        import review_workflow_load
+        review_workflow_load.clear_review_workflow_load()
         mcp_server._save_review_decision_lock(None)
         mcp_server.review_workflow_load.clear_review_workflow_load()
 
@@ -149,6 +156,8 @@ def _mark(action, pr_number=6, **kwargs):
 
 class TestDuplicateRequestChangesSuppression(unittest.TestCase):
     def tearDown(self):
+        import review_workflow_load
+        review_workflow_load.clear_review_workflow_load()
         mcp_server._save_review_decision_lock(None)
         mcp_server.review_workflow_load.clear_review_workflow_load()