From a7932de06ffc6dabfe323e0e8a6c1e2c3ca7bd22 Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Fri, 24 May 2019 10:55:34 -0400 Subject: [PATCH] Retry harder in face of 409/429 during module teardown. (#8113) Closes #7505. --- storage/tests/system.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/storage/tests/system.py b/storage/tests/system.py index 83ac7b7669c6..0b9127d7afdb 100644 --- a/storage/tests/system.py +++ b/storage/tests/system.py @@ -54,7 +54,7 @@ def _bad_copy(bad_request): def _empty_bucket(bucket): """Empty a bucket of all existing blobs (including multiple versions).""" - for blob in bucket.list_blobs(versions=True): + for blob in list(bucket.list_blobs(versions=True)): try: blob.delete() except exceptions.NotFound: @@ -83,9 +83,8 @@ def setUpModule(): def tearDownModule(): - _empty_bucket(Config.TEST_BUCKET) errors = (exceptions.Conflict, exceptions.TooManyRequests) - retry = RetryErrors(errors, max_tries=9) + retry = RetryErrors(errors, max_tries=15) retry(_empty_bucket)(Config.TEST_BUCKET) retry(Config.TEST_BUCKET.delete)(force=True)