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

Merge pull request #23288 from smarterclayton/refactor_codec

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-03-26 10:47:58 -07:00
parent 95e09e303f 54eaa56b92
commit 1ad3049ed6
10 changed files with 299 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/runtime/serializer/codec_test.go
View File

@@ -173,7 +173,7 @@ func GetTestScheme() (*runtime.Scheme, runtime.Codec) {
s.AddUnversionedTypes(externalGV, &unversioned.Status{})
cf := newCodecFactory(s, testMetaFactory{})
cf := newCodecFactory(s, newSerializersForScheme(s, testMetaFactory{}))
codec := cf.LegacyCodec(unversioned.GroupVersion{Version: "v1"})
return s, codec
}
@@ -263,7 +263,7 @@ func TestVersionedEncoding(t *testing.T) {
t.Fatal(err)
}
cf := newCodecFactory(s, testMetaFactory{})
cf := newCodecFactory(s, newSerializersForScheme(s, testMetaFactory{}))
encoder, _ := cf.SerializerForFileExtension("json")
// codec that is unversioned uses the target version
@@ -326,7 +326,7 @@ func TestConvertTypesWhenDefaultNamesMatch(t *testing.T) {
}
expect := &TestType1{A: "test"}
codec := newCodecFactory(s, testMetaFactory{}).LegacyCodec(unversioned.GroupVersion{Version: "v1"})
codec := newCodecFactory(s, newSerializersForScheme(s, testMetaFactory{})).LegacyCodec(unversioned.GroupVersion{Version: "v1"})
obj, err := runtime.Decode(codec, data)
if err != nil {