Updating ExpectDelete to ignore already deleted objects (#115)

sarthakkothari · web-flow · commit a43b1f82abee · 2024-12-18T13:55:29.000-08:00
* Updating ExpectDeleted to ignore deleted objects

* Trigger Build
diff --git a/test/expectations/expectations.go b/test/expectations/expectations.go
@@ -162,8 +162,8 @@ func ExpectStatusUpdated(ctx context.Context, c client.Client, objects ...client
 func ExpectDeleted(ctx context.Context, c client.Client, objects ...client.Object) {
 	GinkgoHelper()
 	for _, o := range objects {
-		Expect(c.Delete(ctx, o)).To(Succeed())
-		Expect(c.Get(ctx, client.ObjectKeyFromObject(o), o)).To(Or(Succeed(), MatchError(ContainSubstring("not found"))))
+		Expect(client.IgnoreNotFound(c.Delete(ctx, o))).To(Succeed())
+		Expect(client.IgnoreNotFound(c.Get(ctx, client.ObjectKeyFromObject(o), o))).To(Succeed())
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -162,8 +162,8 @@ func ExpectStatusUpdated(ctx context.Context, c client.Client, objects ...client`
`162`	`162`	`func ExpectDeleted(ctx context.Context, c client.Client, objects ...client.Object) {`
`163`	`163`	`GinkgoHelper()`
`164`	`164`	`for _, o := range objects {`
`165`		`- Expect(c.Delete(ctx, o)).To(Succeed())`
`166`		`- Expect(c.Get(ctx, client.ObjectKeyFromObject(o), o)).To(Or(Succeed(), MatchError(ContainSubstring("not found"))))`
	`165`	`+ Expect(client.IgnoreNotFound(c.Delete(ctx, o))).To(Succeed())`
	`166`	`+ Expect(client.IgnoreNotFound(c.Get(ctx, client.ObjectKeyFromObject(o), o))).To(Succeed())`
`167`	`167`	`}`
`168`	`168`	`}`
`169`	`169`