fix UT

Signed-off-by: Britania Rodriguez Reyes <britaniar@microsoft.com>

Author: britaniar

pkg/controllers/clusterresourceplacement/controller_integration_test.go

@@ -1338,7 +1338,7 @@ var _ = Describe("Test ClusterResourcePlacement Controller", func() {
 			wantCondition = metav1.Condition{
 				Status: metav1.ConditionTrue,
 				Type:   string(placementv1beta1.ClusterResourcePlacementAvailableConditionType),
-				Reason: condition.AvailableReason,
+				Reason: condition.NoResourcesSelectedReason,
 			}
 			meta.SetStatusCondition(&wantCRP.Status.Conditions, wantCondition)
 			wantCondition.Type = string(placementv1beta1.ResourceBindingAvailable)

pkg/controllers/workgenerator/controller_integration_test.go

@@ -1309,19 +1309,31 @@ var _ = Describe("Test Work Generator Controller", func() {
 					TargetCluster:        memberClusterName,
 				}
 				createClusterResourceBinding(&binding, spec)
+			})
+
+			AfterEach(func() {
+				// Delete the master resource snapshot.
+				Expect(k8sClient.Delete(ctx, masterSnapshot)).Should(SatisfyAny(Succeed(), utils.NotFoundMatcher{}))
+				By(fmt.Sprintf("Master resource snapshot %s deleted", masterSnapshot.Name))
+				// Delete the second resource snapshot.
+				Expect(k8sClient.Delete(ctx, secondSnapshot)).Should(SatisfyAny(Succeed(), utils.NotFoundMatcher{}))
+				By(fmt.Sprintf("Secondary resource snapshot %s deleted", secondSnapshot.Name))
+				// Delete the binding.
+				Expect(k8sClient.Delete(ctx, binding)).Should(SatisfyAny(Succeed(), utils.NotFoundMatcher{}))
+				By(fmt.Sprintf("Resource binding %s deleted", binding.Name))
+			})
 
+			It("Should create necessary work in the target namespace after a resource snapshot with selected envelope object is created", func() {
 				// Now create the second resource snapshot.
 				secondSnapshot = generateResourceSnapshot(2, 2, 1, [][]byte{
 					testEnvelopConfigMap, testNameSpace,
 				})
 				Expect(k8sClient.Create(ctx, secondSnapshot)).Should(Succeed())
 				By(fmt.Sprintf("Secondary resource snapshot %s created", secondSnapshot.Name))
-
 				// Update master resource snapshot labels.
 				Expect(k8sClient.Get(ctx, types.NamespacedName{Name: masterSnapshot.Name}, masterSnapshot)).Should(Succeed())
 				masterSnapshot.Labels[placementv1beta1.IsLatestSnapshotLabel] = "false"
 				Expect(k8sClient.Update(ctx, masterSnapshot)).Should(Succeed())
-
 				// Update binding.
 				updateRolloutStartedGeneration(&binding)
 				By(fmt.Sprintf("resource binding %s updated", binding.Name))
@@ -1332,21 +1344,6 @@ var _ = Describe("Test Work Generator Controller", func() {
 					return errors.IsNotFound(err)
 				}, duration, interval).Should(BeTrue(), "controller should not create work in hub cluster")
 				By("Work for first resource snapshot is not created in hub cluster")
-			})
-
-			AfterEach(func() {
-				// Delete the master resource snapshot.
-				Expect(k8sClient.Delete(ctx, masterSnapshot)).Should(SatisfyAny(Succeed(), utils.NotFoundMatcher{}))
-				By(fmt.Sprintf("Master resource snapshot %s deleted", masterSnapshot.Name))
-				// Delete the second resource snapshot.
-				Expect(k8sClient.Delete(ctx, secondSnapshot)).Should(SatisfyAny(Succeed(), utils.NotFoundMatcher{}))
-				By(fmt.Sprintf("Secondary resource snapshot %s deleted", secondSnapshot.Name))
-				// Delete the binding.
-				Expect(k8sClient.Delete(ctx, binding)).Should(SatisfyAny(Succeed(), utils.NotFoundMatcher{}))
-				By(fmt.Sprintf("Resource binding %s deleted", binding.Name))
-			})
-
-			It("Should create necessary work in the target namespace after a resource snapshot with selected envelope object is created", func() {
 				// Check the work for the secondary resource snapshot is created, it's name is crp-subindex.
 				secondWork := placementv1beta1.Work{}
 				Eventually(func() error {
@@ -1443,6 +1440,26 @@ var _ = Describe("Test Work Generator Controller", func() {
 			})
 
 			It("Should create necessary work in the target namespace after a resource snapshot with selected resource is created", func() {
+				// Now create the second resource snapshot.
+				secondSnapshot = generateResourceSnapshot(2, 2, 1, [][]byte{
+					testResourceCRD, testNameSpace,
+				})
+				Expect(k8sClient.Create(ctx, secondSnapshot)).Should(Succeed())
+				By(fmt.Sprintf("Secondary resource snapshot %s created", secondSnapshot.Name))
+				// Update master resource snapshot labels.
+				Expect(k8sClient.Get(ctx, types.NamespacedName{Name: masterSnapshot.Name}, masterSnapshot)).Should(Succeed())
+				masterSnapshot.Labels[placementv1beta1.IsLatestSnapshotLabel] = "false"
+				Expect(k8sClient.Update(ctx, masterSnapshot)).Should(Succeed())
+				// Update binding.
+				updateRolloutStartedGeneration(&binding)
+				By(fmt.Sprintf("resource binding %s updated", binding.Name))
+				// Check the work for the master resource snapshot is not created.
+				work := placementv1beta1.Work{}
+				Consistently(func() bool {
+					err := k8sClient.Get(ctx, types.NamespacedName{Name: fmt.Sprintf(placementv1beta1.FirstWorkNameFmt, testCRPName), Namespace: memberClusterNamespaceName}, &work)
+					return errors.IsNotFound(err)
+				}, duration, interval).Should(BeTrue(), "controller should not create work in hub cluster")
+				By("Work for first resource snapshot is not created in hub cluster")
 				// Check the work for the secondary resource snapshot is created, it's name is crp-subindex.
 				secondWork := placementv1beta1.Work{}
 				Eventually(func() error {