Merge pull request #7589 from killianmuldoon/fix-flaky-clusterclass-delete

k8s-ci-robot · web-flow · commit cf62fe98d0b9 · 2022-11-23T05:30:14.000-08:00
🐛 Add CleanupAndWait call for flaky ClusterClass test
diff --git a/internal/webhooks/test/clusterclass_test.go b/internal/webhooks/test/clusterclass_test.go
@@ -446,7 +446,7 @@ func TestClusterClassWebhook_Delete_MultipleExistingClusters(t *testing.T) {
 	defer func() {
 		// Delete each of the clusters.
 		for _, c := range clusters {
-			g.Expect(env.Delete(ctx, c)).To(Succeed())
+			g.Expect(env.CleanupAndWait(ctx, c)).To(Succeed())
 		}
 
 		// Delete the ClusterClasses in the API server.

Original file line number	Diff line number	Diff line change
`@@ -446,7 +446,7 @@ func TestClusterClassWebhook_Delete_MultipleExistingClusters(t *testing.T) {`
`446`	`446`	`defer func() {`
`447`	`447`	`// Delete each of the clusters.`
`448`	`448`	`for _, c := range clusters {`
`449`		`- g.Expect(env.Delete(ctx, c)).To(Succeed())`
	`449`	`+ g.Expect(env.CleanupAndWait(ctx, c)).To(Succeed())`
`450`	`450`	`}`
`451`	`451`
`452`	`452`	`// Delete the ClusterClasses in the API server.`