github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-10-07 11:04:44 +00:00
Code Issues Projects Releases Wiki Activity

Use cmp.Diff instead of diff.Object* in pkg/api

Browse Source
This commit is contained in:
Jie Shen
2021-03-17 17:35:21 +08:00
committed by drfish
parent 2a26f276a8
commit 3807a92df0
10 changed files with 61 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/api/testing/serialization_proto_test.go
View File

@@ -25,6 +25,8 @@ import (
"testing"
"github.com/gogo/protobuf/proto"
"github.com/google/go-cmp/cmp"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/apitesting/fuzzer"
apiequality "k8s.io/apimachinery/pkg/api/equality"
@@ -32,7 +34,6 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/runtime/serializer/protobuf"
"k8s.io/apimachinery/pkg/util/diff"
"k8s.io/kubernetes/pkg/api/legacyscheme"
api "k8s.io/kubernetes/pkg/apis/core"
_ "k8s.io/kubernetes/pkg/apis/extensions"
@@ -112,7 +113,7 @@ func TestProtobufRoundTrip(t *testing.T) {
}
if !apiequality.Semantic.Equalities.DeepEqual(out, obj) {
t.Logf("marshal\n%s", hex.Dump(data))
t.Fatalf("Unmarshal is unequal\n%s", diff.ObjectGoPrintDiff(out, obj))
t.Fatalf("Unmarshal is unequal\n%s", cmp.Diff(out, obj))
}
}