From 5b370855e78413adb4b0aecb92b29ed5fa3afbe8 Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Mon, 12 Sep 2016 14:51:52 -0700 Subject: [PATCH] Making sure language system test teardown deletes bucket. Fixes #2305. --- system_tests/language.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/system_tests/language.py b/system_tests/language.py index 30ba4db2389e..000f251bf2bf 100644 --- a/system_tests/language.py +++ b/system_tests/language.py @@ -22,10 +22,6 @@ from retry import RetryErrors -# 429 Too Many Requests in case API requests rate-limited. -retry_429 = RetryErrors(exceptions.TooManyRequests) - - class Config(object): """Run-time configuration to be modified at set-up. @@ -42,11 +38,17 @@ def setUpModule(): storage_client = storage.Client() bucket_name = 'new' + unique_resource_id() Config.TEST_BUCKET = storage_client.bucket(bucket_name) + # 429 Too Many Requests in case API requests rate-limited. + retry_429 = RetryErrors(exceptions.TooManyRequests) retry_429(Config.TEST_BUCKET.create)() def tearDownModule(): - retry_429(Config.TEST_BUCKET.delete)() + # 409 Conflict if the bucket is full. + # 429 Too Many Requests in case API requests rate-limited. + bucket_retry = RetryErrors( + (exceptions.TooManyRequests, exceptions.Conflict)) + bucket_retry(Config.TEST_BUCKET.delete)(force=True) class TestLanguage(unittest.TestCase):