Attempt to avoid rate limit (#156)

Use pre-existing info instead of making another API call.

python/miss-islington#153

Author: Mariatta

miss_islington/status_change.py

@@ -27,7 +27,11 @@ async def check_status(event, gh, *args, **kwargs):
             pr_labels = pr_for_commit["labels"]
             if util.pr_is_automerge(pr_labels) and util.pr_is_awaiting_merge(pr_labels):
                 await check_ci_status_and_approval(
-                    gh, sha, leave_comment=True, is_automerge=True
+                    gh,
+                    sha,
+                    pr_for_commit=pr_for_commit,
+                    leave_comment=True,
+                    is_automerge=True,
                 )
 
 
@@ -39,18 +43,22 @@ async def pr_reviewed(event, gh, *args, **kwargs):
     if util.pr_is_automerge(pr_labels) and util.pr_is_awaiting_merge(pr_labels):
         sha = event.data["pull_request"]["head"]["sha"]
 
-        await check_ci_status_and_approval(gh, sha, is_automerge=True)
+        await check_ci_status_and_approval(
+            gh, sha, pr_for_commit=event.data["pull_request"], is_automerge=True
+        )
     elif event.data["pull_request"]["user"][
         "login"
     ] == "miss-islington" and util.pr_is_awaiting_merge(
         event.data["pull_request"]["labels"]
     ):
         sha = event.data["pull_request"]["head"]["sha"]
-        await check_ci_status_and_approval(gh, sha)
+        await check_ci_status_and_approval(
+            gh, sha, pr_for_commit=event.data["pull_request"]
+        )
 
 
 async def check_ci_status_and_approval(
-    gh, sha, leave_comment=False, is_automerge=False
+    gh, sha, pr_for_commit=None, leave_comment=False, is_automerge=False
 ):
 
     result = await gh.getitem(f"/repos/python/cpython/commits/{sha}/status")
@@ -61,7 +69,8 @@ async def check_ci_status_and_approval(
         "pending" not in all_ci_status
         and "continuous-integration/travis-ci/pr" in all_ci_context
     ):
-        pr_for_commit = await util.get_pr_for_commit(gh, sha)
+        if not pr_for_commit:
+            pr_for_commit = await util.get_pr_for_commit(gh, sha)
         if pr_for_commit:
             pr_number = pr_for_commit["number"]
             normalized_pr_title = util.normalize_title(

tests/test_status_change.py

@@ -204,6 +204,9 @@ async def test_awaiting_merge_label_added_and_ci_passed_pr_is_merged():
             "user": {"login": "miss-islington"},
             "labels": [{"name": "awaiting merge"}, {"name": "CLA signed"}],
             "head": {"sha": sha},
+            "number": 5547,
+            "title": "[3.6] bpo-32720: Fixed the replacement field grammar documentation. (GH-5544)",
+            "body": "\n\n`arg_name` and `element_index` are defined as `digit`+ instead of `integer`.\n(cherry picked from commit 7a561afd2c79f63a6008843b83733911d07f0119)\n\nCo-authored-by: Mariatta <Mariatta@users.noreply.github.com>",
         },
     }
 
@@ -225,21 +228,7 @@ async def test_awaiting_merge_label_added_and_ci_passed_pr_is_merged():
                     "context": "continuous-integration/travis-ci/pr",
                 },
             ],
-        },
-        "/repos/python/cpython/pulls/5547": {
-            "labels": [{"name": "awaiting merge"}, {"name": "CLA signed"}]
-        },
-        f"/search/issues?q=type:pr+repo:python/cpython+sha:{sha}": {
-            "total_count": 1,
-            "items": [
-                {
-                    "number": 5547,
-                    "title": "[3.6] bpo-32720: Fixed the replacement field grammar documentation. (GH-5544)",
-                    "body": "\n\n`arg_name` and `element_index` are defined as `digit`+ instead of `integer`.\n(cherry picked from commit 7a561afd2c79f63a6008843b83733911d07f0119)\n\nCo-authored-by: Mariatta <Mariatta@users.noreply.github.com>",
-                    "labels": [{"name": "awaiting merge"}, {"name": "CLA signed"}],
-                }
-            ],
-        },
+        }
     }
 
     getiter = {
@@ -1001,6 +990,9 @@ async def test_awaiting_merge_label_and_automerge_label_added_not_miss_islington
                 {"name": "CLA signed"},
             ],
             "head": {"sha": sha},
+            "number": 5547,
+            "title": "bpo-32720: Fixed the replacement field grammar documentation.",
+            "body": "\n\n`arg_name` and `element_index` are defined as `digit`+ instead of `integer`.",
         },
     }
 
@@ -1022,31 +1014,7 @@ async def test_awaiting_merge_label_and_automerge_label_added_not_miss_islington
                     "context": "continuous-integration/travis-ci/pr",
                 },
             ],
-        },
-        "/repos/python/cpython/pulls/5547": {
-            "user": {"login": "Mariatta"},
-            "merged_by": None,
-            "labels": [
-                {"name": "awaiting merge"},
-                {"name": AUTOMERGE_LABEL},
-                {"name": "CLA signed"},
-            ],
-        },
-        f"/search/issues?q=type:pr+repo:python/cpython+sha:{sha}": {
-            "total_count": 1,
-            "items": [
-                {
-                    "number": 5547,
-                    "title": "bpo-32720: Fixed the replacement field grammar documentation.",
-                    "body": "\n\n`arg_name` and `element_index` are defined as `digit`+ instead of `integer`.",
-                    "labels": [
-                        {"name": "awaiting merge"},
-                        {"name": AUTOMERGE_LABEL},
-                        {"name": "CLA signed"},
-                    ],
-                }
-            ],
-        },
+        }
     }
 
     getiter = {"/repos/python/cpython/pulls/5547/commits": [{"sha": sha}]}
@@ -1154,6 +1122,9 @@ async def test_automerge_multi_commits_in_pr():
                 {"name": "CLA signed"},
             ],
             "head": {"sha": sha},
+            "number": 5547,
+            "title": "bpo-32720: Fixed the replacement field grammar documentation.",
+            "body": "\n\n`arg_name` and `element_index` are defined as `digit`+ instead of `integer`.",
         },
     }
 
@@ -1175,31 +1146,7 @@ async def test_automerge_multi_commits_in_pr():
                     "context": "continuous-integration/travis-ci/pr",
                 },
             ],
-        },
-        "/repos/python/cpython/pulls/5547": {
-            "user": {"login": "Mariatta"},
-            "merged_by": None,
-            "labels": [
-                {"name": "awaiting merge"},
-                {"name": AUTOMERGE_LABEL},
-                {"name": "CLA signed"},
-            ],
-        },
-        f"/search/issues?q=type:pr+repo:python/cpython+sha:{sha}": {
-            "total_count": 1,
-            "items": [
-                {
-                    "number": 5547,
-                    "title": "bpo-32720: Fixed the replacement field grammar documentation.",
-                    "body": "\n\n`arg_name` and `element_index` are defined as `digit`+ instead of `integer`.",
-                    "labels": [
-                        {"name": "awaiting merge"},
-                        {"name": AUTOMERGE_LABEL},
-                        {"name": "CLA signed"},
-                    ],
-                }
-            ],
-        },
+        }
     }
 
     getiter = {
@@ -1237,6 +1184,9 @@ async def test_automerge_commit_not_found():
                 {"name": "CLA signed"},
             ],
             "head": {"sha": sha},
+            "number": 5547,
+            "title": "bpo-32720: Fixed the replacement field grammar documentation.",
+            "body": "\n\n`arg_name` and `element_index` are defined as `digit`+ instead of `integer`.",
         },
     }
 
@@ -1258,31 +1208,7 @@ async def test_automerge_commit_not_found():
                     "context": "continuous-integration/travis-ci/pr",
                 },
             ],
-        },
-        "/repos/python/cpython/pulls/5547": {
-            "user": {"login": "Mariatta"},
-            "merged_by": None,
-            "labels": [
-                {"name": "awaiting merge"},
-                {"name": AUTOMERGE_LABEL},
-                {"name": "CLA signed"},
-            ],
-        },
-        f"/search/issues?q=type:pr+repo:python/cpython+sha:{sha}": {
-            "total_count": 1,
-            "items": [
-                {
-                    "number": 5547,
-                    "title": "bpo-32720: Fixed the replacement field grammar documentation.",
-                    "body": "\n\n`arg_name` and `element_index` are defined as `digit`+ instead of `integer`.",
-                    "labels": [
-                        {"name": "awaiting merge"},
-                        {"name": AUTOMERGE_LABEL},
-                        {"name": "CLA signed"},
-                    ],
-                }
-            ],
-        },
+        }
     }
 
     getiter = {"/repos/python/cpython/pulls/5547/commits": []}