resolve conflicts for PR #465

tests/test_mcp_server.py

@@ -99,6 +99,9 @@ CREATE_PR_ENV = {
     ),
 }
 
+ISSUE_LOCK_FILE = "/tmp/gitea_issue_lock.json"
+
+
 def _sample_issue_lock(issue_number=123, branch_name="feat/x", **overrides):
     import issue_lock_provenance
 
@@ -3427,21 +3430,34 @@ class TestIssueLocking(unittest.TestCase):
            return_value=(True, []))
     @patch("mcp_server.get_auth_header", return_value=FAKE_AUTH)
     def test_create_pr_manual_lock_seed_blocked(self, _auth, _role):
-        with open(ISSUE_LOCK_FILE, "w", encoding="utf-8") as f:
+        worktree = os.path.realpath(os.getcwd())
-            json.dump(
+        with tempfile.TemporaryDirectory() as lock_dir:
+            env = {**self._create_pr_env(), "GITEA_ISSUE_LOCK_DIR": lock_dir}
+            with patch.dict(os.environ, env, clear=True):
+                issue_lock_store.save_lock_file(
+                    issue_lock_store.lock_file_path(
+                        remote="prgs",
+                        org="Scaled-Tech-Consulting",
+                        repo=mcp_server.REMOTES["prgs"]["repo"],
+                        issue_number=447,
+                        lock_dir=lock_dir,
+                    ),
                 _sample_issue_lock(
                     issue_number=447,
                     branch_name="feat/issue-447-lock-provenance",
+                    remote="prgs",
+                    org="Scaled-Tech-Consulting",
+                    repo=mcp_server.REMOTES["prgs"]["repo"],
+                    worktree_path=worktree,
                     lock_provenance=None,
                 ),
-                f,
                 )
-        with patch.dict(os.environ, CREATE_PR_ENV, clear=True):
                 with self.assertRaises(RuntimeError) as ctx:
                     gitea_create_pr(
                         title="feat: lock provenance Closes #447",
                         head="feat/issue-447-lock-provenance",
                         remote="prgs",
+                        worktree_path=worktree,
                     )
         self.assertIn("lock provenance", str(ctx.exception).lower())