github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-01 07:47:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #71370 from WanLinghao/serialization_test_fix

Browse Source 
fix unit test failure in ./pkg/api/testing/serialization_test.go
This commit is contained in:
k8s-ci-robot 2018-11-30 00:04:36 -08:00 committed by GitHub
commit d8b9d9b381
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/api/testing/serialization_test.go
View File

@ -86,9 +86,11 @@ func TestSetControllerConversion(t *testing.T) {
rs := &apps.ReplicaSet{} rs := &apps.ReplicaSet{}
rc := &api.ReplicationController{} rc := &api.ReplicationController{}
extGroup := schema.GroupVersion{Group: "apps", Version: "v1"}
extCodec := legacyscheme.Codecs.LegacyCodec(extGroup)
extGroup := testapi.Apps defaultGroup := schema.GroupVersion{Group: "", Version: "v1"}
defaultGroup := testapi.Default defaultCodec := legacyscheme.Codecs.LegacyCodec(defaultGroup)
fuzzInternalObject(t, schema.GroupVersion{Group: "apps", Version: runtime.APIVersionInternal}, rs, rand.Int63()) fuzzInternalObject(t, schema.GroupVersion{Group: "apps", Version: runtime.APIVersionInternal}, rs, rand.Int63())
@ -102,7 +104,7 @@ func TestSetControllerConversion(t *testing.T) {
} }
t.Logf("rs._internal.apps -> rs.v1.apps") t.Logf("rs._internal.apps -> rs.v1.apps")
data, err := runtime.Encode(extGroup.Codec(), rs) data, err := runtime.Encode(extCodec, rs)
if err != nil { if err != nil {
t.Fatalf("unexpected encoding error: %v", err) t.Fatalf("unexpected encoding error: %v", err)
} }
@ -110,9 +112,9 @@ func TestSetControllerConversion(t *testing.T) {
decoder := legacyscheme.Codecs.DecoderToVersion( decoder := legacyscheme.Codecs.DecoderToVersion(
legacyscheme.Codecs.UniversalDeserializer(), legacyscheme.Codecs.UniversalDeserializer(),
runtime.NewMultiGroupVersioner( runtime.NewMultiGroupVersioner(
*defaultGroup.GroupVersion(), defaultGroup,
schema.GroupKind{Group: defaultGroup.GroupVersion().Group}, schema.GroupKind{Group: defaultGroup.Group},
schema.GroupKind{Group: extGroup.GroupVersion().Group}, schema.GroupKind{Group: extGroup.Group},
), ),
) )
@ -122,7 +124,7 @@ func TestSetControllerConversion(t *testing.T) {
} }
t.Logf("rc._internal -> rc.v1") t.Logf("rc._internal -> rc.v1")
data, err = runtime.Encode(defaultGroup.Codec(), rc) data, err = runtime.Encode(defaultCodec, rc)
if err != nil { if err != nil {
t.Fatalf("unexpected encoding error: %v", err) t.Fatalf("unexpected encoding error: %v", err)
} }