fix(appengine): add retries to log assertion (GoogleCloudPlatform#8801)

Ace Nassri · web-flow · commit fbddb21df8b2 · 2022-12-14T18:13:17.000-05:00
* fix(appengine): add retries to log assertion

* Fix lint; increase retries; restrict retries to AssertionErrors
diff --git a/appengine/standard_python3/bundled-services/mail/flask/main_test.py b/appengine/standard_python3/bundled-services/mail/flask/main_test.py
@@ -14,7 +14,6 @@
 
 import json
 import subprocess
-import time
 import uuid
 
 import backoff
@@ -92,20 +91,21 @@ def test_send_receive(version):
     assert "Successfully sent mail" in response.text
     assert response.status_code == 201
 
-    # Give the mail some time to be delivered and logs to post
-    time.sleep(60)
-
     # Fetch logs to check messages on received mail
-    entries = gcloud_cli(
-        f'logging read "resource.type=gae_app AND resource.labels.version_id={version_id}"'
-    )
-
-    text_payloads = ""
-    for entry in entries:
-        if "textPayload" in entry:
-            text_payloads += entry["textPayload"]
-            text_payloads += "\n"
-
-    expected = f"Received greeting for valid-user@{version_id}-dot-{project_id}.appspotmail.com"
-    assert expected in text_payloads
-    assert "This message should be delivered" in text_payloads
+    @backoff.on_exception(backoff.expo, AssertionError, max_tries=10)
+    def assert_logs():
+        entries = gcloud_cli(
+            f'logging read "resource.type=gae_app AND resource.labels.version_id={version_id}"'
+        )
+
+        text_payloads = ""
+        for entry in entries:
+            if "textPayload" in entry:
+                text_payloads += entry["textPayload"]
+                text_payloads += "\n"
+
+        expected = f"Received greeting for valid-user@{version_id}-dot-{project_id}.appspotmail.com"
+        assert expected in text_payloads
+        assert "This message should be delivered" in text_payloads
+
+    assert_logs()
