From fc9c2ddf0cb84bd43ff241722c970bf510155672 Mon Sep 17 00:00:00 2001 From: Chao Xu Date: Mon, 24 Aug 2015 14:41:02 -0700 Subject: [PATCH] add a fuzz function for expapi.APIVersion --- pkg/api/serialization_test.go | 7 +++---- pkg/api/testing/fuzzer.go | 6 ++++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pkg/api/serialization_test.go b/pkg/api/serialization_test.go index c70cb7ffba9..6eed0666be9 100644 --- a/pkg/api/serialization_test.go +++ b/pkg/api/serialization_test.go @@ -32,9 +32,8 @@ import ( "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util" - // TODO: enable when exapi problems are fixed #13083 - //_ "k8s.io/kubernetes/pkg/expapi" - //_ "k8s.io/kubernetes/pkg/expapi/v1" + _ "k8s.io/kubernetes/pkg/expapi" + _ "k8s.io/kubernetes/pkg/expapi/v1" flag "github.com/spf13/pflag" ) @@ -125,7 +124,7 @@ func TestList(t *testing.T) { roundTripSame(t, item) } -var nonRoundTrippableTypes = util.NewStringSet("ThirdPartyResource") +var nonRoundTrippableTypes = util.NewStringSet() var nonInternalRoundTrippableTypes = util.NewStringSet("List", "ListOptions", "PodExecOptions", "PodAttachOptions") var nonRoundTrippableTypesByVersion = map[string][]string{} diff --git a/pkg/api/testing/fuzzer.go b/pkg/api/testing/fuzzer.go index 2ea5c8fc461..919f183427e 100644 --- a/pkg/api/testing/fuzzer.go +++ b/pkg/api/testing/fuzzer.go @@ -26,6 +26,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/registered" "k8s.io/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/expapi" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" @@ -301,6 +302,11 @@ func FuzzerFor(t *testing.T, version string, src rand.Source) *fuzz.Fuzzer { c.FuzzNoCustom(n) n.Spec.ExternalID = "external" }, + func(s *expapi.APIVersion, c fuzz.Continue) { + // We can't use c.RandString() here because it may generate empty + // string, which will cause tests failure. + s.APIGroup = "something" + }, ) return f }