fix: wait time instead of tries for flaky issues (GoogleCloudPlatform#10387)

engelke · gcf-owl-bot[bot] · web-flow · commit c0384c6c636a · 2023-07-10T15:58:34.000+02:00
* fix: wait time instead of tries for flaky issues * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
diff --git a/appengine/standard_python3/bundled-services/blobstore/flask/main_test.py b/appengine/standard_python3/bundled-services/blobstore/flask/main_test.py
@@ -57,7 +57,7 @@ def gcloud_cli(command):
 
 
 # Wait for app at given URL to initialize
-@backoff.on_exception(backoff.expo, requests.exceptions.HTTPError, max_tries=5)
+@backoff.on_exception(backoff.expo, requests.exceptions.HTTPError, max_time=300)
 def wait_for_app(url):
     r = requests.get(url)
     r.raise_for_status()
diff --git a/appengine/standard_python3/bundled-services/blobstore/wsgi/main_test.py b/appengine/standard_python3/bundled-services/blobstore/wsgi/main_test.py
@@ -57,7 +57,7 @@ def gcloud_cli(command):
 
 
 # Wait for app to initialize
-@backoff.on_exception(backoff.expo, requests.exceptions.HTTPError, max_tries=3)
+@backoff.on_exception(backoff.expo, requests.exceptions.HTTPError, max_time=300)
 def wait_for_app(url):
     r = requests.get(url)
     r.raise_for_status()
diff --git a/appengine/standard_python3/bundled-services/deferred/flask/main_test.py b/appengine/standard_python3/bundled-services/deferred/flask/main_test.py
@@ -68,7 +68,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)
+    @backoff.on_exception(backoff.expo, requests.exceptions.HTTPError, max_time=300)
     def wait_for_app(url):
         r = requests.get(url)
         r.raise_for_status()
diff --git a/appengine/standard_python3/bundled-services/deferred/wsgi/main_test.py b/appengine/standard_python3/bundled-services/deferred/wsgi/main_test.py
@@ -68,7 +68,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)
+    @backoff.on_exception(backoff.expo, requests.exceptions.HTTPError, max_time=300)
     def wait_for_app(url):
         r = requests.get(url)
         r.raise_for_status()
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,7 +56,7 @@ def gcloud_cli(command):
     raise Exception(output.stderr)
 
 
-@backoff.on_exception(backoff.expo, requests.exceptions.HTTPError, max_tries=6)
+@backoff.on_exception(backoff.expo, requests.exceptions.HTTPError, max_time=300)
 def get_with_retries(url):
     r = requests.get(url)
     r.raise_for_status()
diff --git a/appengine/standard_python3/bundled-services/mail/flask/main.py b/appengine/standard_python3/bundled-services/mail/flask/main.py
@@ -92,7 +92,9 @@ def receive_mail(path):
     message = mail.InboundEmailMessage(request.get_data())
 
     # Do something with the message
-    print(f"Received greeting for {escape(message.to)} at {escape(message.date)} from {escape(message.sender)}")
+    print(
+        f"Received greeting for {escape(message.to)} at {escape(message.date)} from {escape(message.sender)}"
+    )
     for content_type, payload in message.bodies("text/plain"):
         print(f"Text/plain body: {payload.decode()}")
         break
diff --git a/appengine/standard_python3/bundled-services/mail/flask/main_test.py b/appengine/standard_python3/bundled-services/mail/flask/main_test.py
@@ -67,7 +67,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)
+    @backoff.on_exception(backoff.expo, requests.exceptions.HTTPError, max_time=300)
     def wait_for_app(url):
         r = requests.get(url)
         r.raise_for_status()
diff --git a/appengine/standard_python3/bundled-services/mail/wsgi/main_test.py b/appengine/standard_python3/bundled-services/mail/wsgi/main_test.py
@@ -56,7 +56,7 @@ def gcloud_cli(command):
     raise Exception(output.stderr)
 
 
-@backoff.on_exception(backoff.expo, requests.exceptions.HTTPError, max_tries=6)
+@backoff.on_exception(backoff.expo, requests.exceptions.HTTPError, max_time=300)
 def get_with_retries(url):
     r = requests.get(url)
     r.raise_for_status()
