tests: update retry conf tests using the updated testbench emulator (#555)

cojenco · tseaver · web-flow · commit e3e6a0a1868e · 2021-08-25T13:01:58.000-07:00
* tests: address changes to the updated testbench emulator

* fix typo

* Add comment to explain clearing etag in bucket_set_iampolicy

Co-authored-by: Tres Seaver &lt;tseaver@palladion.com&gt;

Co-authored-by: Tres Seaver &lt;tseaver@palladion.com&gt;
diff --git a/tests/conformance/retry_strategy_test_data.json b/tests/conformance/retry_strategy_test_data.json
@@ -54,13 +54,13 @@
             ]
           },
           {
-            "name": "storage.buckets.lockRententionPolicy",
+            "name": "storage.buckets.lockRetentionPolicy",
             "resources": [
               "BUCKET"
             ]
           },
           {
-            "name": "storage.buckets.testIamPermission",
+            "name": "storage.buckets.testIamPermissions",
             "resources": [
               "BUCKET"
             ]
diff --git a/tests/conformance/test_conformance.py b/tests/conformance/test_conformance.py
@@ -164,7 +164,6 @@ def bucket_test_iam_permissions(client, _preconditions, **resources):
     bucket.test_iam_permissions(permissions)
 
 
-# TODO(cathyo@): issue resolved in the new testbench where buckets have a valid metageneration
 def bucket_lock_retention_policy(client, _preconditions, **resources):
     bucket = client.bucket(resources.get("bucket").name)
     bucket.retention_period = 60
@@ -222,8 +221,8 @@ def client_get_service_account_email(client, _preconditions, **_):
     client.get_service_account_email()
 
 
-def bucket_patch(client, _preconditions, **_):
-    bucket = client.get_bucket("bucket")
+def bucket_patch(client, _preconditions, **resources):
+    bucket = client.get_bucket(resources.get("bucket").name)
     metageneration = bucket.metageneration
     bucket.storage_class = "COLDLINE"
     if _preconditions:
@@ -233,7 +232,7 @@ def bucket_patch(client, _preconditions, **_):
 
 
 def bucket_update(client, _preconditions, **resources):
-    bucket = client.get_bucket("bucket")
+    bucket = client.get_bucket(resources.get("bucket").name)
     metageneration = bucket.metageneration
     bucket._properties = {"storageClass": "STANDARD"}
     if _preconditions:
@@ -252,6 +251,8 @@ def bucket_set_iam_policy(client, _preconditions, **resources):
     if _preconditions:
         bucket.set_iam_policy(policy)
     else:
+        # IAM policies have no metageneration:  clear ETag to avoid checking that it matches.
+        policy.etag = None
         bucket.set_iam_policy(policy)
 
 
@@ -311,7 +312,7 @@ def blob_update(client, _preconditions, **resources):
 def bucket_copy_blob(client, _preconditions, **resources):
     object = resources.get("object")
     bucket = client.bucket(resources.get("bucket").name)
-    destination = client.bucket("bucket")
+    destination = client.create_bucket(uuid.uuid4().hex)
     if _preconditions:
         bucket.copy_blob(
             object, destination, new_name=uuid.uuid4().hex, if_generation_match=0
@@ -443,8 +444,8 @@ def blob_create_resumable_upload_session(client, _preconditions, **resources):
     "storage.buckets.getIamPolicy": [bucket_get_iam_policy],
     "storage.buckets.insert": [client_create_bucket, bucket_create],
     "storage.buckets.list": [client_list_buckets],
-    "storage.buckets.lockRententionPolicy": [],
-    "storage.buckets.testIamPermission": [bucket_test_iam_permissions],
+    "storage.buckets.lockRetentionPolicy": [bucket_lock_retention_policy],
+    "storage.buckets.testIamPermissions": [bucket_test_iam_permissions],
     "storage.notifications.delete": [notification_delete],
     "storage.notifications.get": [
         bucket_get_notification,
@@ -466,15 +467,14 @@ def blob_create_resumable_upload_session(client, _preconditions, **resources):
         bucket_list_blobs,
         bucket_delete,
     ],  # S1 end
-    "storage.buckets.patch": [bucket_patch],  # S2 start
+    "storage.buckets.patch": [bucket_patch],  # S2/S3 start
     "storage.buckets.setIamPolicy": [bucket_set_iam_policy],
     "storage.buckets.update": [bucket_update],
     "storage.objects.compose": [blob_compose],
     "storage.objects.copy": [bucket_copy_blob, bucket_rename_blob],
     "storage.objects.delete": [
         bucket_delete_blob,
         bucket_delete_blobs,
-        bucket_delete,
         blob_delete,
         bucket_rename_blob,
     ],
@@ -487,7 +487,7 @@ def blob_create_resumable_upload_session(client, _preconditions, **resources):
     ],
     "storage.objects.patch": [blob_patch],
     "storage.objects.rewrite": [blob_rewrite, blob_update_storage_class],
-    "storage.objects.update": [blob_update],  # S2 end
+    "storage.objects.update": [blob_update],  # S2/S3 end
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -54,13 +54,13 @@`
`54`	`54`	`]`
`55`	`55`	`},`
`56`	`56`	`{`
`57`		`- "name": "storage.buckets.lockRententionPolicy",`
	`57`	`+ "name": "storage.buckets.lockRetentionPolicy",`
`58`	`58`	`"resources": [`
`59`	`59`	`"BUCKET"`
`60`	`60`	`]`
`61`	`61`	`},`
`62`	`62`	`{`
`63`		`- "name": "storage.buckets.testIamPermission",`
	`63`	`+ "name": "storage.buckets.testIamPermissions",`
`64`	`64`	`"resources": [`
`65`	`65`	`"BUCKET"`
`66`	`66`	`]`