fix: more HTTP request retries (GoogleCloudPlatform#10140)

engelke · web-flow · commit 48e567b21d5c · 2023-06-02T16:52:18.000-05:00
* fix: more HTTP request retries

* fix: missed return value
diff --git a/appengine/standard_python3/bundled-services/mail/django/main_test.py b/appengine/standard_python3/bundled-services/mail/django/main_test.py
@@ -56,6 +56,20 @@ def gcloud_cli(command):
     raise Exception(output.stderr)
 
 
+@backoff.on_exception(backoff.expo, requests.exceptions.HTTPError, max_tries=6)
+def get_with_retries(url):
+    r = requests.get(url)
+    r.raise_for_status()
+    return r
+
+
+@backoff.on_exception(backoff.expo, requests.exceptions.HTTPError, max_tries=6)
+def post_with_retries(url, data):
+    r = requests.post(url, data=data)
+    r.raise_for_status()
+    return r
+
+
 @pytest.fixture
 def version():
     """Launch a new version of the app for testing, and yield the
@@ -68,12 +82,7 @@ def version():
     version_hostname = f"{version_id}-dot-{project_id}.appspot.com"
 
     # Wait for app to initialize
-    @backoff.on_exception(backoff.expo, requests.exceptions.HTTPError, max_tries=3)
-    def wait_for_app(url):
-        r = requests.get(url)
-        r.raise_for_status()
-
-    wait_for_app(f"https://{version_hostname}/")
+    get_with_retries(f"https://{version_hostname}/")
 
     yield project_id, version_id
 
@@ -85,12 +94,12 @@ def test_send_receive(version):
     version_hostname = f"{version_id}-dot-{project_id}.appspot.com"
 
     # Check that version is serving form in home page
-    response = requests.get(f"https://{version_hostname}/")
+    response = get_with_retries(f"https://{version_hostname}/")
     assert '<form action="" method="POST">' in response.text
     assert response.status_code == 200
 
     # Send valid mail
-    response = requests.post(
+    response = post_with_retries(
         f"https://{version_hostname}/",
         data={
             "email": f"valid-user@{version_id}-dot-{project_id}.appspotmail.com",
