From cc46c3ab373527808caf72d6d79dcbb9e97ed8a5 Mon Sep 17 00:00:00 2001 From: nadavleva Date: Sun, 12 Oct 2025 20:14:47 +0300 Subject: [PATCH 1/2] Fix flaky VRG test by waiting for deletion to complete (issue #2294) Signed-off-by: nadavleva --- internal/controller/vrg_recipe_test.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/internal/controller/vrg_recipe_test.go b/internal/controller/vrg_recipe_test.go index 0aea142f2c..cc0ecb737b 100644 --- a/internal/controller/vrg_recipe_test.go +++ b/internal/controller/vrg_recipe_test.go @@ -6,6 +6,7 @@ package controllers_test import ( "context" "strings" + "time" volrep "github.com/csi-addons/kubernetes-csi-addons/api/replication.storage/v1alpha1" . "github.com/onsi/ginkgo/v2" @@ -249,7 +250,7 @@ var _ = Describe("VolumeReplicationGroupRecipe", func() { } vrgDelete := func() { Expect(k8sClient.Delete(ctx, vrg)).To(Succeed()) - Eventually(vrgGet).Should(MatchError(k8serrors.NewNotFound( + Eventually(vrgGet, time.Second*10, time.Millisecond*100).Should(MatchError(k8serrors.NewNotFound( schema.GroupResource{ Group: ramen.GroupVersion.Group, Resource: "volumereplicationgroups", From 9dd03bd44e5d62c204d324017c80f5983c1bb4ae Mon Sep 17 00:00:00 2001 From: nadavleva Date: Wed, 15 Oct 2025 20:44:45 +0300 Subject: [PATCH 2/2] Use WithTimeout in VRG test as suggested by reviewer Signed-off-by: nadavleva --- internal/controller/vrg_recipe_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/controller/vrg_recipe_test.go b/internal/controller/vrg_recipe_test.go index cc0ecb737b..4d8f8ba89c 100644 --- a/internal/controller/vrg_recipe_test.go +++ b/internal/controller/vrg_recipe_test.go @@ -250,7 +250,7 @@ var _ = Describe("VolumeReplicationGroupRecipe", func() { } vrgDelete := func() { Expect(k8sClient.Delete(ctx, vrg)).To(Succeed()) - Eventually(vrgGet, time.Second*10, time.Millisecond*100).Should(MatchError(k8serrors.NewNotFound( + Eventually(vrgGet).WithTimeout(10 * time.Second).Should(MatchError(k8serrors.NewNotFound( schema.GroupResource{ Group: ramen.GroupVersion.Group, Resource: "volumereplicationgroups",