Catch kombu.exceptions.OperationalError exception. (#234)

Author: Mariatta

miss_islington/backport_pr.py

@@ -3,7 +3,8 @@
 import random
 
 import gidgethub.routing
-import redis
+from kombu import exceptions as kombu_ex
+from redis import exceptions as redis_ex
 
 from . import tasks, util
 
@@ -76,10 +77,10 @@ async def kickoff_backport_task(
             created_by=created_by,
             merged_by=merged_by,
         )
-    except redis.exceptions.ConnectionError as ce:
+    except (redis_ex.ConnectionError, kombu_ex.OperationalError) as ex:
         retry_num = retry_num + 1
         if retry_num < 5:
-            err_message = f"I'm having trouble backporting to `{branch}`. Reason: '`{ce}`'. Will retry in 1 minute. Retry # {retry_num}"
+            err_message = f"I'm having trouble backporting to `{branch}`. Reason: '`{ex}`'. Will retry in 1 minute. Retry # {retry_num}"
             await util.leave_comment(gh, issue_number, err_message)
             await asyncio.sleep(int(os.environ.get("RETRY_SLEEP_TIME", "60")))
             await kickoff_backport_task(

tests/test_backport_pr.py

@@ -1,9 +1,11 @@
 import os
 from unittest import mock
 
-import redis
 from gidgethub import sansio
 
+import redis
+import kombu
+
 os.environ["REDIS_URL"] = "someurl"
 os.environ["RETRY_SLEEP_TIME"] = "1"
 
@@ -248,3 +250,36 @@ async def test_backport_pr_redis_connection_error():
         backport_delay_mock.side_effect = redis.exceptions.ConnectionError
         await backport_pr.router.dispatch(event, gh)
         assert "trouble backporting after 5 attempts" in gh.post_data["body"]
+
+
+async def test_backport_pr_kombu_operational_error():
+    data = {
+        "action": "closed",
+        "pull_request": {
+            "merged": True,
+            "number": 1,
+            "merged_by": {"login": "Mariatta"},
+            "user": {"login": "gvanrossum"},
+            "merge_commit_sha": "f2393593c99dd2d3ab8bfab6fcc5ddee540518a9",
+        },
+        "repository": {
+            "issues_url": "https://api.github.com/repos/python/cpython/issues/1"
+        },
+    }
+    event = sansio.Event(data, event="pull_request", delivery_id="1")
+
+    getitem = {
+        "https://api.github.com/repos/python/cpython/issues/1": {
+            "labels_url": "https://api.github.com/repos/python/cpython/issues/1/labels{/name}"
+        },
+        "https://api.github.com/repos/python/cpython/issues/1/labels": [
+            {"name": "CLA signed"},
+            {"name": "needs backport to 3.7"},
+        ],
+    }
+
+    gh = FakeGH(getitem=getitem)
+    with mock.patch("miss_islington.tasks.backport_task.delay") as backport_delay_mock:
+        backport_delay_mock.side_effect = kombu.exceptions.OperationalError
+        await backport_pr.router.dispatch(event, gh)
+        assert "trouble backporting after 5 attempts" in gh.post_data["body"]