Retry retries

Author: stevebux

Makefile

@@ -134,6 +134,7 @@ TEST_CMD := APIGEE_ACCESS_TOKEN="$(APIGEE_ACCESS_TOKEN)" \
 	STATUS_ENDPOINT_API_KEY="$(STATUS_ENDPOINT_API_KEY)" \
 	PYTHONPATH=. poetry run pytest --disable-warnings -vv \
 	--color=yes \
+	-n 4 \
 	--api-name=nhs-notify-supplier \
 	--proxy-name="$(PROXY_NAME)" \
 	-s \

tests/e2e-tests/lib/letters.py

@@ -51,26 +51,31 @@ def get_pending_letter_ids(
     headers: dict,
     letters_endpoint: str,
     limit: int = 1,
-    timeout_s: int = 60,
-    interval_s: int = 5,
+    timeout_s: int = 20,
+    interval_s: int = 2,
+    retries: int = 5,
 ) -> list:
-    """Poll GET /letters until the requested number of PENDING letters are returned.
+    """Injects the given number of pending letters as test data, then waits for them to become
+    visible via the letters endpoint. Retries to account for other tests running in parallel stealing the letters
 
     Returns a list of letter ID strings.
-    Raises TimeoutError if fewer than `limit` letters are returned within timeout_s.
+    Raises TimeoutError if fewer than `limit` letters are returned after all retries are exhausted.
     """
-    deadline = time.monotonic() + timeout_s
-    while time.monotonic() < deadline:
-        response = requests.get(
-            f"{url}/{letters_endpoint}?limit={limit}", headers=headers
-        )
-        response.raise_for_status()
-        data = response.json().get("data", [])
-        if len(data) >= limit:
-            return [item.get("id") for item in data]
-        time.sleep(interval_s)
+
+    for _ in range(retries):
+        create_test_data(limit)
+        deadline = time.monotonic() + timeout_s
+        while time.monotonic() < deadline:
+            response = requests.get(
+                f"{url}/{letters_endpoint}?limit={limit}", headers=headers
+            )
+            response.raise_for_status()
+            data = response.json().get("data", [])
+            if len(data) >= limit:
+                return [item.get("id") for item in data]
+            time.sleep(interval_s)
 
     raise TimeoutError(
-        f"Timed out after {timeout_s}s waiting for {limit} PENDING letter(s) at "
+        f"Timed out after {retries} retries waiting for {limit} PENDING letter(s) at "
         f"{url}/{letters_endpoint}"
     )