claude-dev-env 1.93.0 → 1.94.0

package/skills/pr-converge/scripts/test_check_convergence.py

@@ -1,12 +1,8 @@
 """Tests for check_convergence.
 
 Covers the bugteam audit gate (`_check_bugteam_clean`) which identifies
-bugteam reviews by body header signature rather than by the posting user's
-GitHub login. Three scenarios are exercised:
-
-- a clean bugteam review on the current HEAD passes the gate
-- a dirty bugteam review on the current HEAD fails the gate
-- the absence of any bugteam review on the current HEAD fails the gate
+bugteam reviews by body header signature, the down-flag resolvers, the
+reviewer-bypass paths through ``check_all``, and the ``main`` entry point.
 """
 
 from __future__ import annotations
@@ -20,12 +16,12 @@ from typing import Callable
 
 import pytest
 
+import _pr_converge_path_setup  # noqa: F401
+from pr_converge_skill_constants.constants import EXIT_CODE_GH_ERROR
+
 _SCRIPTS_DIRECTORY = Path(__file__).absolute().parent
 _PR_CONVERGE_DIRECTORY = _SCRIPTS_DIRECTORY.parent
 
-if str(_PR_CONVERGE_DIRECTORY) not in sys.path:
-    sys.path.insert(0, str(_PR_CONVERGE_DIRECTORY))
-
 
 def _load_module() -> ModuleType:
     for each_cached_name in [
@@ -72,6 +68,16 @@ NON_BUGTEAM_BODY = (
     "Cursor Bugbot has reviewed your changes and found 0 potential issues."
 )
 
+_ALL_LEAF_GATE_NAMES = [
+    "_check_bugbot",
+    "_check_bugbot_not_dirty",
+    "_check_bugteam_clean",
+    "_check_bot_review",
+    "_count_unresolved_bot_threads",
+    "_get_mergeable",
+    "_check_no_pending_reviews",
+]
+
 
 def _make_stub_gh_paginated(
     all_review_objects: list[dict[str, object]],
@@ -85,6 +91,27 @@ def _make_stub_gh_paginated(
     return stub_gh_api_paginated
 
 
+def _passing_head_sha(**_call_keywords: object) -> str:
+    return CURRENT_HEAD_SHA
+
+
+def _passing_gate(**_call_keywords: object) -> tuple[bool, str]:
+    return True, "stub passing"
+
+
+def _raise_if_called(gate_label: str) -> Callable[..., tuple[bool, str]]:
+    def _stub(**_call_keywords: object) -> tuple[bool, str]:
+        raise AssertionError(f"{gate_label} must not run when its gate is bypassed")
+
+    return _stub
+
+
+def _patch_all_gates_passing(monkeypatch: pytest.MonkeyPatch) -> None:
+    monkeypatch.setattr(check_convergence, "_get_pr_head_sha", _passing_head_sha)
+    for each_gate_name in _ALL_LEAF_GATE_NAMES:
+        monkeypatch.setattr(check_convergence, each_gate_name, _passing_gate)
+
+
 def should_pass_when_clean_bugteam_review_present_on_current_head(
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:
@@ -96,13 +123,11 @@ def should_pass_when_clean_bugteam_review_present_on_current_head(
             "submitted_at": "2026-05-17T12:00:00Z",
         }
     ]
-    stub = _make_stub_gh_paginated(reviews_payload)
-    monkeypatch.setattr(check_convergence, "_gh_api_paginated", stub)
+    monkeypatch.setattr(
+        check_convergence, "_gh_api_paginated", _make_stub_gh_paginated(reviews_payload)
+    )
     passed, detail = check_convergence._check_bugteam_clean(
-        owner="JonEcho",
-        repo="tests",
-        number=42,
-        head_sha=CURRENT_HEAD_SHA,
+        owner="JonEcho", repo="tests", number=42, head_sha=CURRENT_HEAD_SHA
     )
     assert passed is True
     assert "clean bugteam audit" in detail
@@ -120,13 +145,11 @@ def should_fail_when_dirty_bugteam_review_present_on_current_head(
             "submitted_at": "2026-05-17T12:00:00Z",
         }
     ]
-    stub = _make_stub_gh_paginated(reviews_payload)
-    monkeypatch.setattr(check_convergence, "_gh_api_paginated", stub)
+    monkeypatch.setattr(
+        check_convergence, "_gh_api_paginated", _make_stub_gh_paginated(reviews_payload)
+    )
     passed, detail = check_convergence._check_bugteam_clean(
-        owner="JonEcho",
-        repo="tests",
-        number=42,
-        head_sha=CURRENT_HEAD_SHA,
+        owner="JonEcho", repo="tests", number=42, head_sha=CURRENT_HEAD_SHA
     )
     assert passed is False
     assert "dirty bugteam audit" in detail
@@ -150,13 +173,11 @@ def should_fail_when_no_bugteam_review_present_on_current_head(
             "submitted_at": "2026-05-17T11:00:00Z",
         },
     ]
-    stub = _make_stub_gh_paginated(reviews_payload)
-    monkeypatch.setattr(check_convergence, "_gh_api_paginated", stub)
+    monkeypatch.setattr(
+        check_convergence, "_gh_api_paginated", _make_stub_gh_paginated(reviews_payload)
+    )
     passed, detail = check_convergence._check_bugteam_clean(
-        owner="JonEcho",
-        repo="tests",
-        number=42,
-        head_sha=CURRENT_HEAD_SHA,
+        owner="JonEcho", repo="tests", number=42, head_sha=CURRENT_HEAD_SHA
     )
     assert passed is False
     assert "no bugteam review found" in detail
@@ -175,10 +196,7 @@ def should_fail_with_shape_detail_when_gh_returns_non_list_payload(
         check_convergence, "_gh_api_paginated", stub_gh_api_paginated_returning_object
     )
     passed, detail = check_convergence._check_bugteam_clean(
-        owner="JonEcho",
-        repo="tests",
-        number=42,
-        head_sha=CURRENT_HEAD_SHA,
+        owner="JonEcho", repo="tests", number=42, head_sha=CURRENT_HEAD_SHA
     )
     assert passed is False
     assert "unexpected gh api response shape" in detail
@@ -199,12 +217,8 @@ def test_private_helpers_reject_non_bugteam_body() -> None:
     assert check_convergence._is_clean_bugteam_review(NON_BUGTEAM_BODY) is False
 
 
-CLEAN_LEGACY_BUGTEAM_BODY = (
-    "## /bugteam loop 1 audit: 0 P0 / 0 P1 / 0 P2 → clean"
-)
-DIRTY_LEGACY_BUGTEAM_BODY = (
-    "## /bugteam loop 1 audit: 1 P0 / 0 P1 / 0 P2 → dirty"
-)
+CLEAN_LEGACY_BUGTEAM_BODY = "## /bugteam loop 1 audit: 0 P0 / 0 P1 / 0 P2 → clean"
+DIRTY_LEGACY_BUGTEAM_BODY = "## /bugteam loop 1 audit: 1 P0 / 0 P1 / 0 P2 → dirty"
 
 
 def test_private_helpers_recognize_clean_legacy_header_body() -> None:
@@ -217,60 +231,44 @@ def test_private_helpers_recognize_dirty_legacy_header_body() -> None:
     assert check_convergence._is_clean_bugteam_review(DIRTY_LEGACY_BUGTEAM_BODY) is False
 
 
-def should_resolve_bugbot_down_true_when_flag_set(
-    monkeypatch: pytest.MonkeyPatch,
-) -> None:
+def should_resolve_bugbot_down_true_when_flag_set(monkeypatch: pytest.MonkeyPatch) -> None:
     monkeypatch.delenv("CLAUDE_REVIEWS_DISABLED", raising=False)
     assert check_convergence._resolve_bugbot_down(True) is True
 
 
-def should_resolve_bugbot_down_true_when_env_disables_bugbot(
-    monkeypatch: pytest.MonkeyPatch,
-) -> None:
+def should_resolve_bugbot_down_true_when_env_disables_bugbot(monkeypatch: pytest.MonkeyPatch) -> None:
     monkeypatch.setenv("CLAUDE_REVIEWS_DISABLED", "bugbot")
     assert check_convergence._resolve_bugbot_down(False) is True
 
 
-def should_resolve_bugbot_down_true_when_flag_unset_and_env_empty(
-    monkeypatch: pytest.MonkeyPatch,
-) -> None:
+def should_resolve_bugbot_down_true_when_flag_unset_and_env_empty(monkeypatch: pytest.MonkeyPatch) -> None:
     monkeypatch.delenv("CLAUDE_REVIEWS_DISABLED", raising=False)
     monkeypatch.delenv("CLAUDE_REVIEWS_ENABLED", raising=False)
     assert check_convergence._resolve_bugbot_down(False) is True
 
 
-def should_resolve_bugbot_down_false_when_enabled_lists_bugbot(
-    monkeypatch: pytest.MonkeyPatch,
-) -> None:
+def should_resolve_bugbot_down_false_when_enabled_lists_bugbot(monkeypatch: pytest.MonkeyPatch) -> None:
     monkeypatch.delenv("CLAUDE_REVIEWS_DISABLED", raising=False)
     monkeypatch.setenv("CLAUDE_REVIEWS_ENABLED", "bugbot")
     assert check_convergence._resolve_bugbot_down(False) is False
 
 
-def should_resolve_copilot_down_true_when_flag_set(
-    monkeypatch: pytest.MonkeyPatch,
-) -> None:
+def should_resolve_copilot_down_true_when_flag_set(monkeypatch: pytest.MonkeyPatch) -> None:
     monkeypatch.delenv("CLAUDE_REVIEWS_DISABLED", raising=False)
     assert check_convergence._resolve_copilot_down(True) is True
 
 
-def should_resolve_copilot_down_true_when_env_disables_copilot(
-    monkeypatch: pytest.MonkeyPatch,
-) -> None:
+def should_resolve_copilot_down_true_when_env_disables_copilot(monkeypatch: pytest.MonkeyPatch) -> None:
     monkeypatch.setenv("CLAUDE_REVIEWS_DISABLED", "copilot")
     assert check_convergence._resolve_copilot_down(False) is True
 
 
-def should_resolve_copilot_down_false_when_flag_unset_and_env_empty(
-    monkeypatch: pytest.MonkeyPatch,
-) -> None:
+def should_resolve_copilot_down_false_when_flag_unset_and_env_empty(monkeypatch: pytest.MonkeyPatch) -> None:
     monkeypatch.delenv("CLAUDE_REVIEWS_DISABLED", raising=False)
     assert check_convergence._resolve_copilot_down(False) is False
 
 
-def should_resolve_copilot_down_false_when_env_disables_only_bugbot(
-    monkeypatch: pytest.MonkeyPatch,
-) -> None:
+def should_resolve_copilot_down_false_when_env_disables_only_bugbot(monkeypatch: pytest.MonkeyPatch) -> None:
     monkeypatch.setenv("CLAUDE_REVIEWS_DISABLED", "bugbot")
     assert check_convergence._resolve_copilot_down(False) is False
 
@@ -278,176 +276,30 @@ def should_resolve_copilot_down_false_when_env_disables_only_bugbot(
 def should_bypass_bugbot_gates_when_bugbot_down_is_true(
     monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]
 ) -> None:
-    all_invocation_names: list[str] = []
-
-    def stub_get_pr_head_sha(*, owner: str, repo: str, number: int) -> str:
-        all_invocation_names.append("_get_pr_head_sha")
-        return CURRENT_HEAD_SHA
-
-    def stub_check_bugbot_should_not_be_called(
-        *, owner: str, repo: str, sha: str
-    ) -> tuple[bool, str]:
-        all_invocation_names.append("_check_bugbot")
-        raise AssertionError("_check_bugbot must not be invoked when bugbot_down=True")
-
-    def stub_check_bugbot_not_dirty_should_not_be_called(
-        *, owner: str, repo: str, number: int, head_sha: str
-    ) -> tuple[bool, str]:
-        all_invocation_names.append("_check_bugbot_not_dirty")
-        raise AssertionError(
-            "_check_bugbot_not_dirty must not be invoked when bugbot_down=True"
-        )
-
-    def stub_check_bugteam_clean(
-        *, owner: str, repo: str, number: int, head_sha: str
-    ) -> tuple[bool, str]:
-        all_invocation_names.append("_check_bugteam_clean")
-        return True, "stub passing"
-
-    def stub_check_bot_review(
-        *,
-        owner: str,
-        repo: str,
-        number: int,
-        head_sha: str,
-        login_substring: str,
-        clean_states: tuple[str, ...],
-        dirty_states: tuple[str, ...],
-        label: str,
-    ) -> tuple[bool, str]:
-        all_invocation_names.append("_check_bot_review")
-        return True, "stub passing"
-
-    def stub_count_unresolved_bot_threads(
-        *, owner: str, repo: str, number: int
-    ) -> tuple[bool, str]:
-        all_invocation_names.append("_count_unresolved_bot_threads")
-        return True, "stub passing"
-
-    def stub_get_mergeable(
-        *, owner: str, repo: str, number: int
-    ) -> tuple[bool, str]:
-        all_invocation_names.append("_get_mergeable")
-        return True, "stub passing"
-
-    def stub_check_no_pending_reviews(
-        *, owner: str, repo: str, number: int
-    ) -> tuple[bool, str]:
-        all_invocation_names.append("_check_no_pending_reviews")
-        return True, "stub passing"
-
-    monkeypatch.setattr(check_convergence, "_get_pr_head_sha", stub_get_pr_head_sha)
-    monkeypatch.setattr(check_convergence, "_check_bugbot", stub_check_bugbot_should_not_be_called)
+    _patch_all_gates_passing(monkeypatch)
+    monkeypatch.setattr(check_convergence, "_check_bugbot", _raise_if_called("_check_bugbot"))
     monkeypatch.setattr(
-        check_convergence,
-        "_check_bugbot_not_dirty",
-        stub_check_bugbot_not_dirty_should_not_be_called,
+        check_convergence, "_check_bugbot_not_dirty", _raise_if_called("_check_bugbot_not_dirty")
     )
-    monkeypatch.setattr(check_convergence, "_check_bugteam_clean", stub_check_bugteam_clean)
-    monkeypatch.setattr(check_convergence, "_check_bot_review", stub_check_bot_review)
-    monkeypatch.setattr(
-        check_convergence, "_count_unresolved_bot_threads", stub_count_unresolved_bot_threads
-    )
-    monkeypatch.setattr(check_convergence, "_get_mergeable", stub_get_mergeable)
-    monkeypatch.setattr(
-        check_convergence, "_check_no_pending_reviews", stub_check_no_pending_reviews
-    )
-
     exit_code = check_convergence.check_all(
         owner="o", repo="r", number=1, is_bugbot_down=True, is_copilot_down=False
     )
-    captured_stdout = capsys.readouterr().out
-
-    assert "_check_bugbot" not in all_invocation_names
-    assert "_check_bugbot_not_dirty" not in all_invocation_names
-    assert "bypassed (bugbot_down)" in captured_stdout
+    assert "bypassed (bugbot_down)" in capsys.readouterr().out
     assert exit_code == 0
 
 
 def should_bypass_copilot_gates_when_copilot_down_is_true(
     monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]
 ) -> None:
-    all_invocation_names: list[str] = []
-
-    def stub_get_pr_head_sha(*, owner: str, repo: str, number: int) -> str:
-        return CURRENT_HEAD_SHA
-
-    def stub_check_bugbot(*, owner: str, repo: str, sha: str) -> tuple[bool, str]:
-        return True, "stub passing"
-
-    def stub_check_bugbot_not_dirty(
-        *, owner: str, repo: str, number: int, head_sha: str
-    ) -> tuple[bool, str]:
-        return True, "stub passing"
-
-    def stub_check_bugteam_clean(
-        *, owner: str, repo: str, number: int, head_sha: str
-    ) -> tuple[bool, str]:
-        return True, "stub passing"
-
-    def stub_check_bot_review_should_not_be_called(
-        *,
-        owner: str,
-        repo: str,
-        number: int,
-        head_sha: str,
-        login_substring: str,
-        clean_states: tuple[str, ...],
-        dirty_states: tuple[str, ...],
-        label: str,
-    ) -> tuple[bool, str]:
-        all_invocation_names.append("_check_bot_review")
-        raise AssertionError(
-            "_check_bot_review must not be invoked when copilot_down=True"
-        )
-
-    def stub_count_unresolved_bot_threads(
-        *, owner: str, repo: str, number: int
-    ) -> tuple[bool, str]:
-        return True, "stub passing"
-
-    def stub_get_mergeable(
-        *, owner: str, repo: str, number: int
-    ) -> tuple[bool, str]:
-        return True, "stub passing"
-
-    def stub_check_no_pending_reviews_should_not_be_called(
-        *, owner: str, repo: str, number: int
-    ) -> tuple[bool, str]:
-        all_invocation_names.append("_check_no_pending_reviews")
-        raise AssertionError(
-            "_check_no_pending_reviews must not be invoked when copilot_down=True"
-        )
-
-    monkeypatch.setattr(check_convergence, "_get_pr_head_sha", stub_get_pr_head_sha)
-    monkeypatch.setattr(check_convergence, "_check_bugbot", stub_check_bugbot)
+    _patch_all_gates_passing(monkeypatch)
+    monkeypatch.setattr(check_convergence, "_check_bot_review", _raise_if_called("_check_bot_review"))
     monkeypatch.setattr(
-        check_convergence, "_check_bugbot_not_dirty", stub_check_bugbot_not_dirty
+        check_convergence, "_check_no_pending_reviews", _raise_if_called("_check_no_pending_reviews")
     )
-    monkeypatch.setattr(check_convergence, "_check_bugteam_clean", stub_check_bugteam_clean)
-    monkeypatch.setattr(
-        check_convergence,
-        "_check_bot_review",
-        stub_check_bot_review_should_not_be_called,
-    )
-    monkeypatch.setattr(
-        check_convergence, "_count_unresolved_bot_threads", stub_count_unresolved_bot_threads
-    )
-    monkeypatch.setattr(check_convergence, "_get_mergeable", stub_get_mergeable)
-    monkeypatch.setattr(
-        check_convergence,
-        "_check_no_pending_reviews",
-        stub_check_no_pending_reviews_should_not_be_called,
-    )
-
     exit_code = check_convergence.check_all(
         owner="o", repo="r", number=1, is_bugbot_down=False, is_copilot_down=True
     )
-    captured_stdout = capsys.readouterr().out
-
-    assert "_check_bot_review" not in all_invocation_names
-    assert "_check_no_pending_reviews" not in all_invocation_names
-    assert "bypassed (copilot_down)" in captured_stdout
+    assert "bypassed (copilot_down)" in capsys.readouterr().out
     assert exit_code == 0
 
 
@@ -480,24 +332,18 @@ def should_return_one_from_print_conditions_when_any_condition_fails(
     assert "One or more pre-conditions not met" in captured_stdout
 
 
-def should_propagate_systemexit_from_get_pr_head_sha(
-    monkeypatch: pytest.MonkeyPatch,
-) -> None:
-    def stub_get_pr_head_sha_raising_systemexit(
-        *, owner: str, repo: str, number: int
-    ) -> str:
-        raise SystemExit(check_convergence.EXIT_CODE_GH_ERROR)
+def should_propagate_systemexit_from_get_pr_head_sha(monkeypatch: pytest.MonkeyPatch) -> None:
+    def stub_get_pr_head_sha_raising_systemexit(**_call_keywords: object) -> str:
+        raise SystemExit(EXIT_CODE_GH_ERROR)
 
     monkeypatch.setattr(
         check_convergence, "_get_pr_head_sha", stub_get_pr_head_sha_raising_systemexit
     )
-
     with pytest.raises(SystemExit) as exc_info:
         check_convergence.check_all(
             owner="o", repo="r", number=1, is_bugbot_down=False, is_copilot_down=False
         )
-
-    assert exc_info.value.code == check_convergence.EXIT_CODE_GH_ERROR
+    assert exc_info.value.code == EXIT_CODE_GH_ERROR
 
 
 def should_derive_copilot_down_from_env_when_main_omits_the_flag(
@@ -513,13 +359,12 @@ def should_derive_copilot_down_from_env_when_main_omits_the_flag(
         number: int,
         is_bugbot_down: bool,
         is_copilot_down: bool,
+        is_bugteam_post_blocked: bool = False,
     ) -> int:
         captured_copilot_down.append(is_copilot_down)
         return 0
 
     monkeypatch.setattr(check_convergence, "check_all", stub_check_all)
-    exit_code = check_convergence.main(
-        ["--owner", "o", "--repo", "r", "--pr-number", "1"]
-    )
+    exit_code = check_convergence.main(["--owner", "o", "--repo", "r", "--pr-number", "1"])
     assert exit_code == 0
     assert captured_copilot_down == [True]