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

allow apigroups to opt out of proto round trip testing

Browse Source
This commit is contained in:
Mike Danese 2016-10-12 09:59:35 -07:00
parent 04437f6403
commit d9cc8119ef
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/api/serialization_proto_test.go
View File

@ -33,12 +33,18 @@ import (
"k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/runtime/serializer/protobuf" "k8s.io/kubernetes/pkg/runtime/serializer/protobuf"
"k8s.io/kubernetes/pkg/util/diff" "k8s.io/kubernetes/pkg/util/diff"
"k8s.io/kubernetes/pkg/util/sets"
) )
var nonProtobaleAPIGroups = sets.NewString()
func init() { func init() {
codecsToTest = append(codecsToTest, func(version unversioned.GroupVersion, item runtime.Object) (runtime.Codec, error) { codecsToTest = append(codecsToTest, func(version unversioned.GroupVersion, item runtime.Object) (runtime.Codec, bool, error) {
if nonProtobaleAPIGroups.Has(version.Group) {
return nil, false, nil
}
s := protobuf.NewSerializer(api.Scheme, api.Scheme, "application/arbitrary.content.type") s := protobuf.NewSerializer(api.Scheme, api.Scheme, "application/arbitrary.content.type")
return api.Codecs.CodecForVersions(s, s, testapi.ExternalGroupVersions(), nil), nil return api.Codecs.CodecForVersions(s, s, testapi.ExternalGroupVersions(), nil), true, nil
}) })
} }

12
pkg/api/serialization_test.go
View File

@ -51,9 +51,10 @@ import (
var fuzzIters = flag.Int("fuzz-iters", 20, "How many fuzzing iterations to do.") var fuzzIters = flag.Int("fuzz-iters", 20, "How many fuzzing iterations to do.")
var codecsToTest = []func(version unversioned.GroupVersion, item runtime.Object) (runtime.Codec, error){ var codecsToTest = []func(version unversioned.GroupVersion, item runtime.Object) (runtime.Codec, bool, error){
func(version unversioned.GroupVersion, item runtime.Object) (runtime.Codec, error) { func(version unversioned.GroupVersion, item runtime.Object) (runtime.Codec, bool, error) {
return testapi.GetCodecForObject(item) c, err := testapi.GetCodecForObject(item)
return c, true, err
}, },
} }
@ -135,11 +136,14 @@ func roundTripSame(t *testing.T, group testapi.TestGroup, item runtime.Object, e
version := *group.GroupVersion() version := *group.GroupVersion()
codecs := []runtime.Codec{} codecs := []runtime.Codec{}
for _, fn := range codecsToTest { for _, fn := range codecsToTest {
codec, err := fn(version, item) codec, ok, err := fn(version, item)
if err != nil { if err != nil {
t.Errorf("unable to get codec: %v", err) t.Errorf("unable to get codec: %v", err)
return return
} }
if !ok {
continue
}
codecs = append(codecs, codec) codecs = append(codecs, codec)
} }