test(storage): use t.Cleanup for requesterpays test (googleapis#5792)

Buckets will be cleaned up anyway, so I added the error check back to the cleanup

storage/integration_test.go

@@ -2920,7 +2920,9 @@ func TestIntegration_RequesterPays(t *testing.T) {
 			if err := requesterPaysBucket.ACL().Set(ctx, ACLEntity("user-"+otherUserEmail), RoleOwner); err != nil {
 				t.Fatalf("set ACL: %v", err)
 			}
-			defer h.mustDeleteBucket(requesterPaysBucket)
+			t.Cleanup(func() {
+				h.mustDeleteBucket(requesterPaysBucket)
+			})
 
 			// Make sure the object exists, so we don't get confused by ErrObjectNotExist.
 			// The later write we perform may fail so we always write to the object as the user
@@ -2980,22 +2982,22 @@ func TestIntegration_RequesterPays(t *testing.T) {
 			// Copy
 			_, err = bucket.Object("copy").CopierFrom(bucket.Object(objectName)).Run(ctx)
 			checkforErrors("copy", err)
-			// Delete created "copy" object
-			defer func() {
-				if err := bucket.Object("copy").Delete(ctx); err != nil {
-					t.Fatalf("could not delete copy: %v", err)
-				}
-			}()
+			// Delete "copy" object, if created
+			if err == nil {
+				t.Cleanup(func() {
+					h.mustDeleteObject(bucket.Object("copy"))
+				})
+			}
 
 			// Compose
 			_, err = bucket.Object("compose").ComposerFrom(bucket.Object(objectName), bucket.Object("copy")).Run(ctx)
 			checkforErrors("compose", err)
-			// Delete created "compose" object
-			defer func() {
-				if err := bucket.Object("compose").Delete(ctx); err != nil {
-					t.Fatalf("could not delete compose: %v", err)
-				}
-			}()
+			// Delete "compose" object, if created
+			if err == nil {
+				t.Cleanup(func() {
+					h.mustDeleteObject(bucket.Object("compose"))
+				})
+			}
 
 			// Delete object
 			if err = bucket.Object(objectName).Delete(ctx); err != nil {
@@ -3004,9 +3006,7 @@ func TestIntegration_RequesterPays(t *testing.T) {
 			}
 			checkforErrors("delete object", err)
 		})
-
 	}
-
 }
 
 func TestIntegration_Notifications(t *testing.T) {