update the ut

Signed-off-by: Zhiying Lin <[email protected]>

Author: zhiying-lin

pkg/controllers/clusterresourceplacement/controller.go

@@ -466,6 +466,8 @@ func (r *Reconciler) deleteRedundantResourceSnapshots(ctx context.Context, crp *
 // getOrCreateClusterResourceSnapshot gets or creates a clusterResourceSnapshot for the given clusterResourcePlacement.
 // It returns the latest clusterResourceSnapshot if it exists and is up to date, otherwise it creates a new one.
 // It also returns the ctrl.Result to indicate whether the request should be requeued or not.
+// Note: when the ctrl.Result.Requeue is true, it still returns the current latest resourceSnapshot so that
+// placement can update the rollout status.
 func (r *Reconciler) getOrCreateClusterResourceSnapshot(ctx context.Context, crp *fleetv1beta1.ClusterResourcePlacement, envelopeObjCount int, resourceSnapshotSpec *fleetv1beta1.ResourceSnapshotSpec, revisionHistoryLimit int) (ctrl.Result, *fleetv1beta1.ClusterResourceSnapshot, error) {
 	resourceHash, err := resource.HashOf(resourceSnapshotSpec)
 	crpKObj := klog.KObj(crp)

pkg/controllers/clusterresourceplacement/controller_test.go

@@ -1487,7 +1487,8 @@ func TestGetOrCreateClusterResourceSnapshot(t *testing.T) {
 					Spec: fleetv1beta1.ResourceSnapshotSpec{SelectedResources: []fleetv1beta1.ResourceContent{}},
 				},
 			},
-			wantRequeue: true,
+			wantRequeue:             true,
+			wantLatestSnapshotIndex: 0,
 		},
 		{
 			name:                 "resource has changed and there is an active snapshot with multiple revisionLimit",
@@ -2203,7 +2204,8 @@ func TestGetOrCreateClusterResourceSnapshot(t *testing.T) {
 					Spec: fleetv1beta1.ResourceSnapshotSpec{SelectedResources: []fleetv1beta1.ResourceContent{deploymentResourceContent}},
 				},
 			},
-			wantRequeue: true,
+			wantRequeue:             true,
+			wantLatestSnapshotIndex: 0,
 		},
 		{
 			name:                       "selected resources cross clusterResourceSnapshot limit, revision limit is 1, delete existing clusterResourceSnapshot with missing sub-indexed snapshots & create new clusterResourceSnapshots",
@@ -2708,10 +2710,9 @@ func TestGetOrCreateClusterResourceSnapshot(t *testing.T) {
 				if res.RequeueAfter <= 0 {
 					t.Fatalf("getOrCreateClusterResourceSnapshot() got RequeueAfter %v, want greater than zero value", res.RequeueAfter)
 				}
-			} else {
-				if diff := cmp.Diff(tc.wantResourceSnapshots[tc.wantLatestSnapshotIndex], *got, options...); diff != "" {
-					t.Errorf("getOrCreateClusterResourceSnapshot() mismatch (-want, +got):\n%s", diff)
-				}
+			}
+			if diff := cmp.Diff(tc.wantResourceSnapshots[tc.wantLatestSnapshotIndex], *got, options...); diff != "" {
+				t.Errorf("getOrCreateClusterResourceSnapshot() mismatch (-want, +got):\n%s", diff)
 			}
 			clusterResourceSnapshotList := &fleetv1beta1.ClusterResourceSnapshotList{}
 			if err := fakeClient.List(ctx, clusterResourceSnapshotList); err != nil {