Disable miss-islington comments in check_run as well (#583)

Author: ambv

miss_islington/check_run.py

@@ -8,7 +8,6 @@
 router = routing.Router()
 
 TITLE_RE = re.compile(r"\[(?P<branch>\d+\.\d+)\].+?(?P<pr>\d+)\)")
-AUTOMERGE_TRAILER = "Automerge-Triggered-By"
 
 
 @router.register("check_run", action="completed")
@@ -19,7 +18,8 @@ async def check_run_completed(event, gh, *args, **kwargs):
     sha = event.data["check_run"]["head_sha"]
 
     if event.data["sender"]["login"] == "miss-islington":
-        await check_ci_status_and_approval(gh, sha, leave_comment=True)
+        # Leave comment temporarily disabled when automerge not used. See #577.
+        await check_ci_status_and_approval(gh, sha, leave_comment=False)
     else:
         pr_for_commit = await util.get_pr_for_commit(gh, sha)
         if pr_for_commit:

miss_islington/status_change.py

@@ -115,13 +115,13 @@ async def check_ci_status_and_approval(
                         status = "it's a success"
                     message = f"Status check is done, and {status} {emoji}."
                     if not success:
-                        if is_automerge:
-                            participants = await util.get_gh_participants(gh, pr_number)
-                        else:
-                            original_pr_number = title_match.group("pr")
-                            participants = await util.get_gh_participants(
-                                gh, original_pr_number
-                            )
+                        # if is_automerge:
+                        participants = await util.get_gh_participants(gh, pr_number)
+                        # else:
+                        #    original_pr_number = title_match.group("pr")
+                        #    participants = await util.get_gh_participants(
+                        #        gh, original_pr_number
+                        #    )
                         message = f"{participants}: {message}"
                     await util.leave_comment(
                         gh,

tests/test_check_run.py

@@ -75,7 +75,8 @@ async def test_check_run_completed_ci_passed_with_awaiting_merge_label_pr_is_mer
 
     gh = FakeGH(getitem=getitem, getiter=getiter)
     await check_run.router.dispatch(event, gh)
-    assert len(gh.post_data["body"]) is not None  # leaves a comment
+    # Leave comment temporarily disabled when automerge not used. See #577.
+    # assert len(gh.post_data["body"]) is not None  # leaves a comment
     assert gh.put_data["sha"] == sha  # is merged
     assert gh.put_data["merge_method"] == "squash"
     assert (
@@ -278,7 +279,8 @@ async def test_check_run_completed_failure_with_awaiting_merge_label_pr_is_not_m
 
     gh = FakeGH(getitem=getitem)
     await check_run.router.dispatch(event, gh)
-    assert len(gh.post_data["body"]) is not None  # leaves a comment
+    # Leave comment temporarily disabled when automerge not used. See #577.
+    # assert len(gh.post_data["body"]) is not None  # leaves a comment
     assert not hasattr(gh, "put_data")  # is not merged
 
 
@@ -350,7 +352,8 @@ async def test_check_run_completed_timed_out_with_awaiting_merge_label_pr_is_not
 
     gh = FakeGH(getitem=getitem, getiter=getiter)
     await check_run.router.dispatch(event, gh)
-    assert len(gh.post_data["body"]) is not None  # leaves a comment
+    # Leave comment temporarily disabled when automerge not used. See #577.
+    # assert len(gh.post_data["body"]) is not None  # leaves a comment
     assert not hasattr(gh, "put_data")  # is not merged