fix: harden storage test fixtures (GoogleCloudPlatform#3039)

crwilcox · web-flow · commit 6c7f63e58534 · 2020-03-05T13:37:27.000-08:00
* fix: improve UBLA test fixtures
* fix: improve IAM test fixtures
diff --git a/storage/cloud-client/iam_test.py b/storage/cloud-client/iam_test.py
@@ -16,6 +16,7 @@
 import pytest
 import re
 import time
+import uuid
 
 import storage_remove_bucket_iam_member
 import storage_add_bucket_iam_member
@@ -32,8 +33,11 @@
 
 @pytest.fixture
 def bucket():
-    bucket_name = "test-iam-" + str(int(time.time()))
-    bucket = storage.Client().create_bucket(bucket_name)
+    bucket = None
+    while bucket is None or bucket.exists():
+        bucket_name = "test-iam-{}".format(uuid.uuid4())
+        bucket = storage.Client().bucket(bucket_name)
+    bucket.create()
     bucket.iam_configuration.uniform_bucket_level_access_enabled = True
     bucket.patch()
     yield bucket
diff --git a/storage/cloud-client/uniform_bucket_level_access_test.py b/storage/cloud-client/uniform_bucket_level_access_test.py
@@ -25,10 +25,12 @@
 
 @pytest.fixture()
 def bucket():
-    """Creates a test bucket and deletes it upon completion."""
-    client = storage.Client()
-    bucket_name = "uniform-bucket-level-access-" + str(int(time.time()))
-    bucket = client.create_bucket(bucket_name)
+    """Yields a bucket that is deleted after the test completes."""
+    bucket = None
+    while bucket is None or bucket.exists():
+        bucket_name = "uniform-bucket-level-access-{}".format(int(time.time()))
+        bucket = storage.Client().bucket(bucket_name)
+    bucket.create()
     yield bucket
     time.sleep(3)
     bucket.delete(force=True)
