fix test

Signed-off-by: Zach Aller <[email protected]>

rollout/canary_test.go

@@ -2173,8 +2173,7 @@ func TestSyncRolloutWithConflictInScaleReplicaSet(t *testing.T) {
 
 	f.expectPatchRolloutAction(r2)
 	f.expectUpdateReplicaSetAction(rs2) // attempt to scale replicaset but conflict
-	//f.expectGetReplicaSetAction(rs2)    // get new replicaset from cluster
-	//f.expectPatchReplicaSetAction(rs2)  // instead of update patch replicaset
+	f.expectPatchReplicaSetAction(rs2)  // instead of update patch replicaset
 
 	key := fmt.Sprintf("%s/%s", r2.Namespace, r2.Name)
 	c, i, k8sI := f.newController(func() time.Duration { return 30 * time.Minute })
@@ -2227,15 +2226,10 @@ func TestSyncRolloutWithConflictInSyncReplicaSetRevision(t *testing.T) {
 
 	f.expectPatchRolloutAction(r2)
 	f.expectUpdateReplicaSetAction(rs1) // attempt to update replicaset revision but conflict
-	//f.expectGetReplicaSetAction(rs1)    // get new replicaset from cluster
-	//f.expectPatchReplicaSetAction(rs1)  // instead of update patch replicaset
+	f.expectPatchReplicaSetAction(rs1)  // instead of update patch replicaset
 
 	f.expectUpdateReplicaSetAction(rs2) // attempt to scale replicaset but conflict
-	//f.expectGetReplicaSetAction(rs2)    // get new replicaset from cluster
-	//f.expectPatchReplicaSetAction(rs2)  // instead of update patch replicaset
+	f.expectPatchReplicaSetAction(rs2)  // instead of update patch replicaset
 
 	f.runController(key, true, false, c, i, k8sI)
-
-	r2.ObjectMeta.Annotations["test"] = "test"
-	f.client.ArgoprojV1alpha1().Rollouts(r1.Namespace).Update(context.Background(), r2, metav1.UpdateOptions{})
 }