e2e: Refactor worktree delete removal tests

e2e_tests/test_worktrees.py

@@ -632,95 +632,41 @@ def test_worktree_delete_refusal_no_tracking_branch():
         assert before == after
 
 
-def test_worktree_delete_refusal_uncommited_changes_new_file():
+@pytest.mark.parametrize(
+    "reason",
+    (
+        "new_file",
+        "changed_file",
+        "deleted_file",
+        "new_commit",
+        "tracking_branch_mismatch",
+    ),
+)
+def test_worktree_delete_refusal(reason):
     with TempGitRepositoryWorktree.get(funcname()) as (base_dir, _commit):
         cmd = grm(["wt", "add", "test", "--track", "origin/test"], cwd=base_dir)
         assert cmd.returncode == 0
 
+        if reason == "new_file":
             shell(f"cd {base_dir}/test && touch changed_file")
-
+        elif reason == "changed_file":
-        before = checksum_directory(f"{base_dir}/test")
-        cmd = grm(["wt", "delete", "test"], cwd=base_dir)
-        assert cmd.returncode != 0
-        assert len(cmd.stdout) == 0
-        stderr = cmd.stderr.lower()
-        assert "refuse" in stderr or "refusing" in stderr
-        assert "test" in os.listdir(base_dir)
-
-        after = checksum_directory(f"{base_dir}/test")
-        assert before == after
-
-
-def test_worktree_delete_refusal_uncommited_changes_changed_file():
-    with TempGitRepositoryWorktree.get(funcname()) as (base_dir, _commit):
-        cmd = grm(["wt", "add", "test", "--track", "origin/test"], cwd=base_dir)
-        assert cmd.returncode == 0
-
-        shell(f"cd {base_dir}/test && git ls-files | shuf | head | xargs rm -rf")
-
-        before = checksum_directory(f"{base_dir}/test")
-        cmd = grm(["wt", "delete", "test"], cwd=base_dir)
-        assert cmd.returncode != 0
-        assert len(cmd.stdout) == 0
-        stderr = cmd.stderr.lower()
-        assert "refuse" in stderr or "refusing" in stderr
-        assert "test" in os.listdir(base_dir)
-
-        after = checksum_directory(f"{base_dir}/test")
-        assert before == after
-
-
-def test_worktree_delete_refusal_uncommited_changes_deleted_file():
-    with TempGitRepositoryWorktree.get(funcname()) as (base_dir, _commit):
-        cmd = grm(["wt", "add", "test", "--track", "origin/test"], cwd=base_dir)
-        assert cmd.returncode == 0
-
             shell(
                 f"cd {base_dir}/test && git ls-files | shuf | head | while read f ; do echo $RANDOM > $f ; done"
             )
-
+        elif reason == "deleted_file":
-        before = checksum_directory(f"{base_dir}/test")
+            shell(f"cd {base_dir}/test && git ls-files | shuf | head | xargs rm -rf")
-        cmd = grm(["wt", "delete", "test"], cwd=base_dir)
+        elif reason == "new_commit":
-        assert cmd.returncode != 0
-        assert len(cmd.stdout) == 0
-        stderr = cmd.stderr.lower()
-        assert "refuse" in stderr or "refusing" in stderr
-        assert "test" in os.listdir(base_dir)
-
-        after = checksum_directory(f"{base_dir}/test")
-        assert before == after
-
-
-def test_worktree_delete_refusal_committed_changes():
-    with TempGitRepositoryWorktree.get(funcname()) as (base_dir, _commit):
-        cmd = grm(["wt", "add", "test", "--track", "origin/test"], cwd=base_dir)
-        assert cmd.returncode == 0
-
             shell(
                 f'cd {base_dir}/test && touch changed_file && git add changed_file && git commit -m "commitmsg"'
             )
-
+        elif reason == "tracking_branch_mismatch":
-        before = checksum_directory(f"{base_dir}/test")
-        cmd = grm(["wt", "delete", "test"], cwd=base_dir)
-        assert cmd.returncode != 0
-        assert len(cmd.stdout) == 0
-        stderr = cmd.stderr.lower()
-        assert "refuse" in stderr or "refusing" in stderr
-        assert "test" in os.listdir(base_dir)
-
-        after = checksum_directory(f"{base_dir}/test")
-        assert before == after
-
-
-def test_worktree_delete_refusal_tracking_branch_mismatch():
-    with TempGitRepositoryWorktree.get(funcname()) as (base_dir, _commit):
-        cmd = grm(["wt", "add", "test", "--track", "origin/test"], cwd=base_dir)
-        assert cmd.returncode == 0
-
             shell(
                 f"cd {base_dir}/test && git push origin test && git reset --hard origin/test^"
             )
 
+        else:
+            raise NotImplementedError()
+
         before = checksum_directory(f"{base_dir}/test")
         cmd = grm(["wt", "delete", "test"], cwd=base_dir)
         assert cmd.returncode != 0