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

apimachinery: handle duplicated and conflicting type registration

Browse Source
This commit is contained in:
Dr. Stefan Schimanski
2017-02-21 12:49:19 +01:00
parent 6050f59b7b
commit 395be3b401
12 changed files with 95 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/api/serialization_test.go
View File

@@ -174,7 +174,8 @@ func TestCommonKindsRegistered(t *testing.T) {
t.Error(err)
}
defaults := gv.WithKind("")
if _, got, err := api.Codecs.LegacyCodec().Decode([]byte(`{"kind":"`+kind+`"}`), &defaults, nil); err != nil || gvk != *got {
var got *schema.GroupVersionKind
if obj, got, err = api.Codecs.LegacyCodec().Decode([]byte(`{"kind":"`+kind+`"}`), &defaults, obj); err != nil || gvk != *got {
t.Errorf("expected %v: %v %v", gvk, got, err)
}
data, err := runtime.Encode(api.Codecs.LegacyCodec(*gv), obj)