From eed822d11a1b6c5a0e4525e20044320d025a6d46 Mon Sep 17 00:00:00 2001
From: Cody Oss <6331106+codyoss@users.noreply.github.com>
Date: Thu, 30 Jun 2022 17:54:15 -0500
Subject: [PATCH] test(compute): wait on operations and don't retry them
 (#6292)

Operations should be waited on and not just created. This was causing
tests to fail because the operation was finishing silently and then
subsquent delete operations could not find the resulting instance
that had already been deleted.

Fixes: #5988
---
 compute/apiv1/smoke_test.go | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/compute/apiv1/smoke_test.go b/compute/apiv1/smoke_test.go
index 9c66a43f0227..14db86863f5f 100644
--- a/compute/apiv1/smoke_test.go
+++ b/compute/apiv1/smoke_test.go
@@ -27,9 +27,6 @@ import (
 
 	"google.golang.org/api/option"
 
-	"cloud.google.com/go/internal"
-	"github.com/googleapis/gax-go/v2"
-
 	"github.com/google/go-cmp/cmp"
 
 	"cloud.google.com/go/internal/testutil"
@@ -478,17 +475,17 @@ func TestCapitalLetter(t *testing.T) {
 	defer func() {
 		timeoutCtx, cancel := context.WithTimeout(ctx, 10*time.Minute)
 		defer cancel()
-		err = internal.Retry(timeoutCtx, gax.Backoff{}, func() (stop bool, err error) {
-			_, err = c.Delete(timeoutCtx,
-				&computepb.DeleteFirewallRequest{
-					Project:  projectId,
-					Firewall: name,
-				})
-			return err == nil, err
-		})
+		op, err := c.Delete(timeoutCtx,
+			&computepb.DeleteFirewallRequest{
+				Project:  projectId,
+				Firewall: name,
+			})
 		if err != nil {
 			t.Error(err)
 		}
+		if err = op.Wait(ctx); err != nil {
+			t.Error(err)
+		}
 	}()
 	fetched, err := c.Get(ctx, &computepb.GetFirewallRequest{
 		Project:  projectId,
@@ -637,11 +634,7 @@ func TestInstanceGroupResize(t *testing.T) {
 		if err != nil {
 			t.Error(err)
 		}
-		err = internal.Retry(timeoutCtx, gax.Backoff{}, func() (stop bool, err error) {
-			err = deleteOp.Wait(ctx)
-			return deleteOp.Done(), err
-		})
-		if err != nil {
+		if err := deleteOp.Wait(ctx); err != nil {
 			t.Error(err)
 		}
 	}()