From 09d6a32970f128fa3bfe85bc9f97e7641de71065 Mon Sep 17 00:00:00 2001 From: HemangChothani Date: Fri, 14 Aug 2020 12:35:20 +0530 Subject: [PATCH 1/2] test: add retry for bucket cmek enabled system test --- tests/system/test_system.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/system/test_system.py b/tests/system/test_system.py index 3fb701d39..6a40e6732 100644 --- a/tests/system/test_system.py +++ b/tests/system/test_system.py @@ -2013,6 +2013,7 @@ def test_rewrite_rotate_csek_to_cmek(self): self.assertEqual(dest.download_as_bytes(), source_data) + @RetryErrors(unittest.TestCase.failureException) def test_upload_new_blob_w_bucket_cmek_enabled(self): blob_name = "test-blob" payload = b"DEADBEEF" From 97e51c6fd21b3397fd1e00f0f3e2d3fdfa464d0a Mon Sep 17 00:00:00 2001 From: HemangChothani Date: Mon, 17 Aug 2020 13:32:11 +0530 Subject: [PATCH 2/2] fix: use test_utils.error --- tests/system/test_system.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/system/test_system.py b/tests/system/test_system.py index 6a40e6732..c730cbce2 100644 --- a/tests/system/test_system.py +++ b/tests/system/test_system.py @@ -2013,7 +2013,6 @@ def test_rewrite_rotate_csek_to_cmek(self): self.assertEqual(dest.download_as_bytes(), source_data) - @RetryErrors(unittest.TestCase.failureException) def test_upload_new_blob_w_bucket_cmek_enabled(self): blob_name = "test-blob" payload = b"DEADBEEF" @@ -2026,6 +2025,7 @@ def test_upload_new_blob_w_bucket_cmek_enabled(self): blob = self.bucket.blob(blob_name) blob.upload_from_string(payload) + retry_429_harder(blob.reload)() # We don't know the current version of the key. self.assertTrue(blob.kms_key_name.startswith(kms_key_name)) @@ -2035,7 +2035,7 @@ def test_upload_new_blob_w_bucket_cmek_enabled(self): self.assertEqual(blob.download_as_bytes(), alt_payload) self.bucket.default_kms_key_name = None - self.bucket.patch() + retry_429_harder(self.bucket.patch)() self.assertIsNone(self.bucket.default_kms_key_name)