Fix patch json unmarshal unitTests comparison failures

Signed-off-by: Tiger Kaovilai <[email protected]>

pkg/common-controller/framework_test.go

@@ -353,7 +353,8 @@ func (r *snapshotReactor) React(action core.Action) (handled bool, ret runtime.O
 			if err != nil {
 				return true, nil, err
 			}
-
+			// following unmarshal removes the time millisecond precision which was present in the original object
+			// make sure time used in tests are in seconds precision
 			err = json.Unmarshal(modified, storedSnapshot)
 			if err != nil {
 				return true, nil, err
@@ -1364,9 +1365,16 @@ func evaluateTestResults(ctrl *csiSnapshotCommonController, reactor *snapshotRea
 //  2. Call the tested function (syncSnapshot/syncContent) via
 //     controllerTest.testCall *once*.
 //  3. Compare resulting contents and snapshots with expected contents and snapshots.
+var thisSnapshotStore *crdv1.VolumeSnapshot
 func runSyncTests(t *testing.T, tests []controllerTest, snapshotClasses []*crdv1.VolumeSnapshotClass) {
 	snapshotscheme.AddToScheme(scheme.Scheme)
 	for _, test := range tests {
+		thisTest = &test
+		if len(test.initialSnapshots) >= 1 {
+			thisSnapshotStore = test.initialSnapshots[0]
+		} else {
+			thisSnapshotStore = nil
+		}
 		klog.V(4).Infof("starting test %q", test.name)
 
 		// Initialize the controller

pkg/common-controller/snapshot_controller.go

@@ -1590,6 +1590,10 @@ func (ctrl *csiSnapshotCommonController) removeSnapshotFinalizer(snapshot *crdv1
 	if err != nil {
 		return newControllerUpdateError(snapshot.Name, err.Error())
 	}
+	if len(newSnapshot.Finalizers) == 0 {
+		// some tests require 0 length finalizers to be nil
+		newSnapshot.Finalizers = nil
+	}
 	_, err = ctrl.storeSnapshotUpdate(newSnapshot)
 	if err != nil {
 		klog.Errorf("failed to update snapshot store %v", err)

pkg/common-controller/snapshot_delete_test.go

@@ -19,6 +19,7 @@ package common_controller
 import (
 	"errors"
 	"testing"
+	"time"
 
 	crdv1 "github.com/kubernetes-csi/external-snapshotter/client/v7/apis/volumesnapshot/v1"
 	"github.com/kubernetes-csi/external-snapshotter/v7/pkg/utils"
@@ -49,7 +50,12 @@ var class5Parameters = map[string]string{
 	utils.PrefixedSnapshotterSecretNamespaceKey: "default",
 }
 
-var timeNowMetav1 = metav1.Now()
+var timeNowMetav1 = func () metav1.Time {
+	// json.unmarshal does not restore millisecond precision
+	// so we need to round the time to seconds
+	timeNow := timeNow.Round(time.Second)
+	return metav1.NewTime(timeNow)
+}()
 
 var (
 	content31 = "content3-1"