testing(videointelligence): retry harder upon 409s [(#4361)](GoogleCl…

…oudPlatform/python-docs-samples#4361) fixes #4354
googleapis · Sep 30, 2020 · 07cf916 · 07cf916
1 parent 9db082a
commit 07cf916
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/packages/google-cloud-videointelligence/samples/analyze/beta_snippets_test.py b/packages/google-cloud-videointelligence/samples/analyze/beta_snippets_test.py
@@ -17,6 +17,8 @@
 import os
 import uuid
 
+import backoff
+from google.api_core.exceptions import Conflict
 from google.cloud import storage
 import pytest
 from six.moves.urllib.request import urlopen
@@ -59,8 +61,13 @@ def bucket():
 
  yield bucket
 
- # Teardown.
- bucket.delete(force=True)
+ # Teardown. We're occasionally seeing 409 conflict errors.
+ # Retrying upon 409s.
+ @backoff.on_exception(backoff.expo, Conflict, max_time=120)
+ def delete_bucket():
+ bucket.delete(force=True)
+
+ delete_bucket()
 
 
 @pytest.mark.slow

diff --git a/packages/google-cloud-videointelligence/samples/analyze/requirements-test.txt b/packages/google-cloud-videointelligence/samples/analyze/requirements-test.txt
@@ -1,2 +1,3 @@
+backoff==1.10.0
 pytest==5.4.3
-flaky==3.7.0
+flaky==3.7.0