Skip to content

Commit cb7ac59

Browse files
zhiying-linZhiying Linryanzhang-oss
authored
test: fix the updating resource selector e2e tests (#573)
Co-authored-by: Zhiying Lin <zhiyinglin@microsoft.com> Co-authored-by: Ryan Zhang <yangzhangrice@hotmail.com>
1 parent 2cb637a commit cb7ac59

File tree

1 file changed

+14
-4
lines changed

1 file changed

+14
-4
lines changed

test/e2e/placement_selecting_resources_test.go

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1089,10 +1089,15 @@ var _ = Describe("validating CRP revision history allowing single revision when
10891089
// may hit 409
10901090
return hubClient.Update(ctx, crp)
10911091
}
1092-
Eventually(updateFunc(), eventuallyDuration, eventuallyInterval).Should(Succeed(), "Failed to update the crp %s", crpName)
1092+
Eventually(updateFunc, eventuallyDuration, eventuallyInterval).Should(Succeed(), "Failed to update the crp %s", crpName)
10931093
})
10941094

1095-
It("should update CRP status as expected", checkIfPlacedWorkResourcesOnAllMemberClusters)
1095+
It("should update CRP status as expected", func() {
1096+
crpStatusUpdatedActual := crpStatusUpdatedActual(workResourceIdentifiers(), allMemberClusterNames, nil)
1097+
Eventually(crpStatusUpdatedActual, eventuallyDuration, eventuallyInterval).Should(Succeed(), "Failed to update CRP %s status as expected", crpName)
1098+
})
1099+
1100+
It("should place the selected resources on member clusters", checkIfPlacedWorkResourcesOnAllMemberClusters)
10961101

10971102
It("should have one policy snapshot revision and one resource snapshot revision", func() {
10981103
Expect(validateCRPSnapshotRevisions(crpName, 1, 1)).Should(Succeed(), "Failed to validate the revision history")
@@ -1180,10 +1185,15 @@ var _ = Describe("validating CRP revision history allowing multiple revisions wh
11801185
// may hit 409
11811186
return hubClient.Update(ctx, crp)
11821187
}
1183-
Eventually(updateFunc(), eventuallyDuration, eventuallyInterval).Should(Succeed(), "Failed to update the crp %s", crpName)
1188+
Eventually(updateFunc, eventuallyDuration, eventuallyInterval).Should(Succeed(), "Failed to update the crp %s", crpName)
11841189
})
11851190

1186-
It("should update CRP status as expected", checkIfPlacedWorkResourcesOnAllMemberClusters)
1191+
It("should update CRP status as expected", func() {
1192+
crpStatusUpdatedActual := crpStatusUpdatedActual(workResourceIdentifiers(), allMemberClusterNames, nil)
1193+
Eventually(crpStatusUpdatedActual, eventuallyDuration, eventuallyInterval).Should(Succeed(), "Failed to update CRP %s status as expected", crpName)
1194+
})
1195+
1196+
It("should place the selected resources on member clusters", checkIfPlacedWorkResourcesOnAllMemberClusters)
11871197

11881198
It("should have one policy snapshot revision and two resource snapshot revisions", func() {
11891199
Expect(validateCRPSnapshotRevisions(crpName, 1, 2)).Should(Succeed(), "Failed to validate the revision history")

0 commit comments

Comments
 (0)