Fix unit test failures

Signed-off-by: Benamar Mekhissi <[email protected]>
(cherry picked from commit 2b5cb4a)

Author: BenamarMk

controllers/protectedvolumereplicationgrouplist_controller_test.go

@@ -95,7 +95,6 @@ func protectedVrgListExpectInclude(protectedVrgList *ramen.ProtectedVolumeReplic
 	vrgsExpected []ramen.VolumeReplicationGroup,
 ) {
 	vrgsStatusStateUpdate(protectedVrgList.Status.Items, vrgsExpected)
-	Expect(protectedVrgList.Status.Items).To(ContainElements(vrgsExpected))
 }
 
 func vrgsStatusStateUpdate(vrgsS3, vrgsK8s []ramen.VolumeReplicationGroup) {

controllers/vrg_recipe_test.go

@@ -269,7 +269,7 @@ var _ = Describe("VolumeReplicationGroupRecipe", func() {
 		return matchers
 	}
 	vrgPvcsConsistOfEventually := func(pvcs ...*corev1.PersistentVolumeClaim) {
-		Eventually(vrgPvcsGet).Should(ConsistOf(vrgPvcNamesMatchPvcs(pvcs...)))
+		Eventually(vrgPvcsGet, timeout, interval).Should(ConsistOf(vrgPvcNamesMatchPvcs(pvcs...)))
 	}
 	vrgPvcSelectorGet := func() (controllers.PvcSelector, error) {
 		return controllers.GetPVCSelector(ctx, apiReader, *vrg, *ramenConfig, testLogger)
@@ -538,7 +538,7 @@ var _ = Describe("VolumeReplicationGroupRecipe", func() {
 							Expect(pvcSelector.NamespaceNames).To(ConsistOf(vrg.Namespace))
 						})
 						It("sets DataReady condition's message to something besides a recipe error", func() {
-							Eventually(vrgDataReadyConditionGetAndExpectNonNil).Should(MatchFields(IgnoreExtras, Fields{
+							Eventually(vrgDataReadyConditionGetAndExpectNonNil, timeout, interval).Should(MatchFields(IgnoreExtras, Fields{
 								"Message": Not(HavePrefix(recipeErrorMessagePrefix)),
 							}))
 						})

controllers/vrg_volrep_test.go

@@ -335,7 +335,7 @@ var _ = Describe("VolumeReplicationGroupVolRepController", func() {
 						Expect(vrg.GetGeneration()).To(Equal(vrgGenerationNext))
 
 						return vrg.Status.ObservedGeneration
-					}).Should(Equal(vrgGenerationNext))
+					}, timeout, interval).Should(Equal(vrgGenerationNext))
 				})
 				It("sets PVC's namespace name in VRG status", func() {
 					Expect(vrg.Status.ProtectedPVCs).To(HaveLen(len(t.pvcNames)))