diff --git a/dynamic/dynamicinformer/informer_test.go b/dynamic/dynamicinformer/informer_test.go index 98acdb40..dac032ed 100644 --- a/dynamic/dynamicinformer/informer_test.go +++ b/dynamic/dynamicinformer/informer_test.go @@ -21,12 +21,12 @@ import ( "testing" "time" + "github.com/google/go-cmp/cmp" "k8s.io/apimachinery/pkg/api/equality" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - "k8s.io/apimachinery/pkg/util/diff" "k8s.io/client-go/dynamic/dynamicinformer" "k8s.io/client-go/dynamic/fake" "k8s.io/client-go/tools/cache" @@ -118,7 +118,7 @@ func TestFilteredDynamicSharedInformerFactory(t *testing.T) { t.Errorf("informer received an object for namespace %s when watching namespace %s", ts.ns, ts.informNS) } if !equality.Semantic.DeepEqual(testObject, objFromInformer) { - t.Fatalf("%v", diff.ObjectDiff(testObject, objFromInformer)) + t.Fatalf("%v", cmp.Diff(testObject, objFromInformer)) } case <-ctx.Done(): if ts.ns == ts.informNS { @@ -239,7 +239,7 @@ func TestDynamicSharedInformerFactory(t *testing.T) { select { case objFromInformer := <-informerReciveObjectCh: if !equality.Semantic.DeepEqual(testObject, objFromInformer) { - t.Fatalf("%v", diff.ObjectDiff(testObject, objFromInformer)) + t.Fatalf("%v", cmp.Diff(testObject, objFromInformer)) } case <-ctx.Done(): t.Errorf("tested informer haven't received an object, waited %v", timeout) diff --git a/dynamic/dynamiclister/lister_test.go b/dynamic/dynamiclister/lister_test.go index 9ebc4794..660b43af 100644 --- a/dynamic/dynamiclister/lister_test.go +++ b/dynamic/dynamiclister/lister_test.go @@ -20,11 +20,11 @@ import ( "reflect" "testing" + "github.com/google/go-cmp/cmp" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - "k8s.io/apimachinery/pkg/util/diff" "k8s.io/client-go/dynamic/dynamiclister" "k8s.io/client-go/tools/cache" ) @@ -90,7 +90,7 @@ func TestNamespaceGetMethod(t *testing.T) { t.Fatal(err) } if !reflect.DeepEqual(test.expectedObject, actualObject) { - t.Fatalf("unexpected object has been returned expected = %v actual = %v, diff = %v", test.expectedObject, actualObject, diff.ObjectDiff(test.expectedObject, actualObject)) + t.Fatalf("unexpected object has been returned expected = %v actual = %v, diff = %v", test.expectedObject, actualObject, cmp.Diff(test.expectedObject, actualObject)) } }) } @@ -188,7 +188,7 @@ func TestListerGetMethod(t *testing.T) { t.Fatal(err) } if !reflect.DeepEqual(test.expectedObject, actualObject) { - t.Fatalf("unexpected object has been returned expected = %v actual = %v, diff = %v", test.expectedObject, actualObject, diff.ObjectDiff(test.expectedObject, actualObject)) + t.Fatalf("unexpected object has been returned expected = %v actual = %v, diff = %v", test.expectedObject, actualObject, cmp.Diff(test.expectedObject, actualObject)) } }) } @@ -245,7 +245,7 @@ func assertListOrDie(expected, actual []*unstructured.Unstructured, t *testing.T for _, actualObject := range actual { if actualObject.GetName() == expectedObject.GetName() { if !reflect.DeepEqual(expectedObject, actualObject) { - t.Fatalf("unexpected object has been returned expected = %v actual = %v, diff = %v", expectedObject, actualObject, diff.ObjectDiff(expectedObject, actualObject)) + t.Fatalf("unexpected object has been returned expected = %v actual = %v, diff = %v", expectedObject, actualObject, cmp.Diff(expectedObject, actualObject)) } found = true } diff --git a/metadata/metadatainformer/informer_test.go b/metadata/metadatainformer/informer_test.go index 2c7b9ab4..f52dbf06 100644 --- a/metadata/metadatainformer/informer_test.go +++ b/metadata/metadatainformer/informer_test.go @@ -22,13 +22,13 @@ import ( "testing" "time" + "github.com/google/go-cmp/cmp" "k8s.io/klog/v2" "k8s.io/apimachinery/pkg/api/equality" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - "k8s.io/apimachinery/pkg/util/diff" "k8s.io/client-go/metadata/fake" "k8s.io/client-go/tools/cache" ) @@ -147,7 +147,7 @@ func TestMetadataSharedInformerFactory(t *testing.T) { select { case objFromInformer := <-informerReciveObjectCh: if !equality.Semantic.DeepEqual(testObject, objFromInformer) { - t.Fatalf("%v", diff.ObjectDiff(testObject, objFromInformer)) + t.Fatalf("%v", cmp.Diff(testObject, objFromInformer)) } case <-ctx.Done(): t.Errorf("tested informer haven't received an object, waited %v", timeout) diff --git a/metadata/metadatalister/lister_test.go b/metadata/metadatalister/lister_test.go index 7c32c1e7..a0e8e058 100644 --- a/metadata/metadatalister/lister_test.go +++ b/metadata/metadatalister/lister_test.go @@ -20,11 +20,11 @@ import ( "reflect" "testing" + "github.com/google/go-cmp/cmp" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - "k8s.io/apimachinery/pkg/util/diff" "k8s.io/client-go/tools/cache" ) @@ -89,7 +89,7 @@ func TestNamespaceGetMethod(t *testing.T) { t.Fatal(err) } if !reflect.DeepEqual(test.expectedObject, actualObject) { - t.Fatalf("unexpected object has been returned expected = %v actual = %v, diff = %v", test.expectedObject, actualObject, diff.ObjectDiff(test.expectedObject, actualObject)) + t.Fatalf("unexpected object has been returned expected = %v actual = %v, diff = %v", test.expectedObject, actualObject, cmp.Diff(test.expectedObject, actualObject)) } }) } @@ -187,7 +187,7 @@ func TestListerGetMethod(t *testing.T) { t.Fatal(err) } if !reflect.DeepEqual(test.expectedObject, actualObject) { - t.Fatalf("unexpected object has been returned expected = %v actual = %v, diff = %v", test.expectedObject, actualObject, diff.ObjectDiff(test.expectedObject, actualObject)) + t.Fatalf("unexpected object has been returned expected = %v actual = %v, diff = %v", test.expectedObject, actualObject, cmp.Diff(test.expectedObject, actualObject)) } }) } @@ -231,7 +231,7 @@ func assertListOrDie(expected, actual []*metav1.PartialObjectMetadata, t *testin for _, actualObject := range actual { if actualObject.GetName() == expectedObject.GetName() { if !reflect.DeepEqual(expectedObject, actualObject) { - t.Fatalf("unexpected object has been returned expected = %v actual = %v, diff = %v", expectedObject, actualObject, diff.ObjectDiff(expectedObject, actualObject)) + t.Fatalf("unexpected object has been returned expected = %v actual = %v, diff = %v", expectedObject, actualObject, cmp.Diff(expectedObject, actualObject)) } found = true }