github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pkg/api: move Semantic equality to k8s.io/apimachinery/pkg/api/equality

Browse Source
This commit is contained in:
Dr. Stefan Schimanski
2017-01-25 14:39:54 +01:00
committed by Dr. Stefan Schimanski
parent 88d9829ad5
commit 79adb99a13
64 changed files with 261 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/api/serialization_proto_test.go
View File

@@ -23,6 +23,7 @@ import (
"testing"
"github.com/gogo/protobuf/proto"
apiequality "k8s.io/apimachinery/pkg/api/equality"
apitesting "k8s.io/apimachinery/pkg/api/testing"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
@@ -68,7 +69,7 @@ func TestUniversalDeserializer(t *testing.T) {
if err != nil {
t.Fatalf("%s: %v", mediaType, err)
}
if !api.Semantic.DeepEqual(expected, obj) {
if !apiequality.Semantic.DeepEqual(expected, obj) {
t.Fatalf("%s: %#v", mediaType, obj)
}
}
@@ -88,7 +89,7 @@ func TestProtobufRoundTrip(t *testing.T) {
if err := out.Unmarshal(data); err != nil {
t.Fatal(err)
}
if !api.Semantic.Equalities.DeepEqual(out, obj) {
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))
}