DEVX-127: fix: fall back to CI token when reviewer self-approval is rejected

2026-07-12 16:33:53 +00:00
parent 5987adee64
commit d035b620e0
4 changed files with 129 additions and 10 deletions
@@ -2,6 +2,7 @@

 from unittest.mock import MagicMock, patch

+import pytest
 from click.testing import CliRunner

 from devx.ci.pr_review import (
@@ -902,7 +903,12 @@ class TestManualReview:
        mock_client_class.return_value.create_review.assert_not_called()

    @patch("devx.ci.pr_review.GiteaClient")
-    def test_manual_review_self_approval_fallback(self, mock_client_class: MagicMock) -> None:
+    def test_manual_review_self_approval_fallback_to_comment(
+        self, mock_client_class: MagicMock, monkeypatch: pytest.MonkeyPatch
+    ) -> None:
+        """Self-approval with no CI token available → fall back to COMMENT."""
+        monkeypatch.delenv("CI_GITEA_API_TOKEN", raising=False)
+        monkeypatch.delenv("CI_GITEA_TOKEN", raising=False)
        client = mock_client_class.return_value
        client.create_review.side_effect = [
            APIError(422, "approve your own pull is not allowed"),
@@ -922,10 +928,77 @@ class TestManualReview:
                "--checklist-categories",
                "1,2,3,4,5,6,7,8",
            ],
-            env={"CI_GITEA_TOKEN": "fake"},
+            env={"REVIEWER_GITEA_API_TOKEN": "fake-reviewer"},
        )
        assert result.exit_code == 0
        assert "Review #202" in result.output
+        # Without CI_GITEA_API_TOKEN, the fallback is COMMENT
+        assert "Self-approval not allowed. Posting COMMENT instead." in result.output
+        assert client.create_review.call_count == 2
+        assert client.create_review.call_args_list[1].kwargs.get("event") == "COMMENT"
+
+    @patch("devx.ci.pr_review.GiteaClient")
+    def test_manual_review_self_approval_falls_back_to_ci_token(self, mock_client_class: MagicMock) -> None:
+        """Self-approval with CI token available → retry APPROVE with CI token (different user)."""
+        client = mock_client_class.return_value
+        client.create_review.side_effect = [
+            APIError(422, "approve your own pull is not allowed"),
+            {"id": 303},
+        ]
+        runner = CliRunner()
+        result = runner.invoke(
+            main,
+            [
+                "42",
+                "oblachno-oss/devx",
+                "--event",
+                "APPROVE",
+                "--body",
+                "x" * 60,
+                "--checklist-confirmed",
+                "--checklist-categories",
+                "1,2,3,4,5,6,7,8",
+            ],
+            env={"REVIEWER_GITEA_API_TOKEN": "fake-reviewer", "CI_GITEA_API_TOKEN": "fake-ci"},
+        )
+        assert result.exit_code == 0
+        assert "Review #303" in result.output
+        assert "Retrying with CI token" in result.output
+        # Second call should still be APPROVE (CI token retry)
+        assert client.create_review.call_count == 2
+        assert client.create_review.call_args_list[1].kwargs.get("event") == "APPROVE"
+
+    @patch("devx.ci.pr_review.GiteaClient")
+    def test_manual_review_ci_token_also_fails_falls_back_to_comment(self, mock_client_class: MagicMock) -> None:
+        """Self-approval + CI token retry also fails → fall back to COMMENT."""
+        client = mock_client_class.return_value
+        client.create_review.side_effect = [
+            APIError(422, "approve your own pull is not allowed"),
+            APIError(422, "approve your own pull is not allowed"),
+            {"id": 404},
+        ]
+        runner = CliRunner()
+        result = runner.invoke(
+            main,
+            [
+                "42",
+                "oblachno-oss/devx",
+                "--event",
+                "APPROVE",
+                "--body",
+                "x" * 60,
+                "--checklist-confirmed",
+                "--checklist-categories",
+                "1,2,3,4,5,6,7,8",
+            ],
+            env={"REVIEWER_GITEA_API_TOKEN": "fake-reviewer", "CI_GITEA_API_TOKEN": "fake-ci"},
+        )
+        assert result.exit_code == 0
+        assert "Review #404" in result.output
+        assert "CI token also cannot approve" in result.output
+        # Third call should be COMMENT (final fallback)
+        assert client.create_review.call_count == 3
+        assert client.create_review.call_args_list[2].kwargs.get("event") == "COMMENT"

    @patch("devx.ci.pr_review.GiteaClient")
    def test_manual_review_other_error_re_raises(self, mock_client_class: MagicMock) -> None: