minor changes

Signed-off-by: Arvind Thirumurugan <[email protected]>

Author: Arvind Thirumurugan

test/e2e/drain_tool_test.go

@@ -110,6 +110,7 @@ var _ = Describe("Drain cluster successfully", Ordered, Serial, func() {
 	It("should update cluster resource placement status as expected", func() {
 		crpStatusUpdatedActual := crpStatusUpdatedActual(workResourceIdentifiers(), noDrainClusterNames, nil, "0")
 		Eventually(crpStatusUpdatedActual, eventuallyDuration, eventuallyInterval).Should(Succeed(), "Failed to update cluster resource placement status as expected")
+		Consistently(crpStatusUpdatedActual, consistentlyDuration, consistentlyInterval).Should(Succeed(), "Failed to update cluster resource placement status as expected")
 	})
 
 	It("should still place resources on the selected clusters which were not drained", func() {
@@ -125,16 +126,9 @@ var _ = Describe("Drain cluster successfully", Ordered, Serial, func() {
 		taintRemovedActual := memberClusterCordonTaintRemovedActual(memberCluster1EastProdName)
 		Eventually(taintRemovedActual, eventuallyDuration, eventuallyInterval).Should(Succeed(), "Failed to remove cordon taint from member cluster")
 	})
-
-	It("should update cluster resource placement status as expected", func() {
-		crpStatusUpdatedActual := crpStatusUpdatedActual(workResourceIdentifiers(), allMemberClusterNames, nil, "0")
-		Eventually(crpStatusUpdatedActual, eventuallyDuration, eventuallyInterval).Should(Succeed(), "Failed to update cluster resource placement status as expected")
-	})
-
-	It("should place resources on the all available member clusters", checkIfPlacedWorkResourcesOnAllMemberClusters)
 })
 
-var _ = FDescribe("Drain cluster blocked - ClusterResourcePlacementDisruptionBudget blocks evictions on all clusters", Ordered, Serial, func() {
+var _ = Describe("Drain cluster blocked - ClusterResourcePlacementDisruptionBudget blocks evictions on all clusters", Ordered, Serial, func() {
 	crpName := fmt.Sprintf(crpNameTemplate, GinkgoParallelProcess())
 	var drainEvictions []placementv1beta1.ClusterResourcePlacementEviction
 
@@ -226,16 +220,9 @@ var _ = FDescribe("Drain cluster blocked - ClusterResourcePlacementDisruptionBud
 		taintRemovedActual := memberClusterCordonTaintRemovedActual(memberCluster1EastProdName)
 		Eventually(taintRemovedActual, eventuallyDuration, eventuallyInterval).Should(Succeed(), "Failed to remove cordon taint from member cluster")
 	})
-
-	It("should update cluster resource placement status as expected", func() {
-		crpStatusUpdatedActual := crpStatusUpdatedActual(workResourceIdentifiers(), allMemberClusterNames, nil, "0")
-		Eventually(crpStatusUpdatedActual, eventuallyDuration, eventuallyInterval).Should(Succeed(), "Failed to update cluster resource placement status as expected")
-	})
-
-	It("should place resources on the all available member clusters", checkIfPlacedWorkResourcesOnAllMemberClusters)
 })
 
-var _ = FDescribe("Drain is allowed on one cluster, blocked on others - ClusterResourcePlacementDisruptionBudget blocks evictions on some clusters", Ordered, Serial, func() {
+var _ = Describe("Drain is allowed on one cluster, blocked on others - ClusterResourcePlacementDisruptionBudget blocks evictions on some clusters", Ordered, Serial, func() {
 	crpName := fmt.Sprintf(crpNameTemplate, GinkgoParallelProcess())
 	var drainEvictions []placementv1beta1.ClusterResourcePlacementEviction
 	var drainClusters, noDrainClusters []*framework.Cluster
@@ -356,6 +343,7 @@ var _ = FDescribe("Drain is allowed on one cluster, blocked on others - ClusterR
 	It("should update cluster resource placement status as expected", func() {
 		crpStatusUpdatedActual := crpStatusUpdatedActual(workResourceIdentifiers(), noDrainClusterNames, nil, "0")
 		Eventually(crpStatusUpdatedActual, eventuallyDuration, eventuallyInterval).Should(Succeed(), "Failed to update cluster resource placement status as expected")
+		Consistently(crpStatusUpdatedActual, consistentlyDuration, consistentlyInterval).Should(Succeed(), "Failed to update cluster resource placement status as expected")
 	})
 
 	It("should still place resources on the selected clusters which were not drained", func() {
@@ -378,8 +366,6 @@ var _ = FDescribe("Drain is allowed on one cluster, blocked on others - ClusterR
 		taintRemovedActual := memberClusterCordonTaintRemovedActual(memberCluster2EastCanaryName)
 		Eventually(taintRemovedActual, eventuallyDuration, eventuallyInterval).Should(Succeed(), "Failed to remove cordon taint from member cluster")
 	})
-
-	It("should place resources on all available member clusters", checkIfPlacedWorkResourcesOnAllMemberClusters)
 })
 
 func runDrainClusterBinary(hubClusterName, memberClusterName string) {