From 6d3042d4f13d1a30ed868ce0524c5edb35bd3ff8 Mon Sep 17 00:00:00 2001 From: kimorris27 Date: Wed, 17 Jan 2024 15:18:30 -0600 Subject: [PATCH] Simplify logic and properly handle the case where the Service is not found during the delete call --- test/e2e/adminapi_delete_managedresource.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/test/e2e/adminapi_delete_managedresource.go b/test/e2e/adminapi_delete_managedresource.go index 9ad1111901f..2c14de7d19e 100644 --- a/test/e2e/adminapi_delete_managedresource.go +++ b/test/e2e/adminapi_delete_managedresource.go @@ -54,10 +54,7 @@ var _ = Describe("[Admin API] Delete managed resource action", func() { // wait for deletion to prevent flakes on retries Eventually(func(g Gomega, ctx context.Context) { err := clients.Kubernetes.CoreV1().Services("default").Delete(ctx, "test", metav1.DeleteOptions{}) - Expect(err).NotTo(HaveOccurred()) - - _, err = clients.Kubernetes.CoreV1().Services("default").Get(ctx, "test", metav1.GetOptions{}) - g.Expect(kerrors.IsNotFound(err)).To(BeTrue(), "expect Service to be deleted") + g.Expect((err == nil || kerrors.IsNotFound(err))).To(BeTrue(), "expect Service to be deleted") }).WithContext(ctx).WithTimeout(DefaultEventuallyTimeout).Should(Succeed()) }()