Skip to content

Commit 650bf71

Browse files
committed
Merge pull request kubernetes#13120 from caesarxuchao/13804
add a fuzz function for expapi.APIVersion
2 parents 6e194c9 + fc9c2dd commit 650bf71

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

pkg/api/serialization_test.go

+3-4
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,8 @@ import (
3232
"k8s.io/kubernetes/pkg/runtime"
3333
"k8s.io/kubernetes/pkg/util"
3434

35-
// TODO: enable when exapi problems are fixed #13083
36-
//_ "k8s.io/kubernetes/pkg/expapi"
37-
//_ "k8s.io/kubernetes/pkg/expapi/v1"
35+
_ "k8s.io/kubernetes/pkg/expapi"
36+
_ "k8s.io/kubernetes/pkg/expapi/v1"
3837

3938
flag "github.com/spf13/pflag"
4039
)
@@ -125,7 +124,7 @@ func TestList(t *testing.T) {
125124
roundTripSame(t, item)
126125
}
127126

128-
var nonRoundTrippableTypes = util.NewStringSet("ThirdPartyResource")
127+
var nonRoundTrippableTypes = util.NewStringSet()
129128
var nonInternalRoundTrippableTypes = util.NewStringSet("List", "ListOptions", "PodExecOptions", "PodAttachOptions")
130129
var nonRoundTrippableTypesByVersion = map[string][]string{}
131130

pkg/api/testing/fuzzer.go

+6
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626
"k8s.io/kubernetes/pkg/api"
2727
"k8s.io/kubernetes/pkg/api/registered"
2828
"k8s.io/kubernetes/pkg/api/resource"
29+
"k8s.io/kubernetes/pkg/expapi"
2930
"k8s.io/kubernetes/pkg/fields"
3031
"k8s.io/kubernetes/pkg/labels"
3132
"k8s.io/kubernetes/pkg/runtime"
@@ -301,6 +302,11 @@ func FuzzerFor(t *testing.T, version string, src rand.Source) *fuzz.Fuzzer {
301302
c.FuzzNoCustom(n)
302303
n.Spec.ExternalID = "external"
303304
},
305+
func(s *expapi.APIVersion, c fuzz.Continue) {
306+
// We can't use c.RandString() here because it may generate empty
307+
// string, which will cause tests failure.
308+
s.APIGroup = "something"
309+
},
304310
)
305311
return f
306312
}

0 commit comments

Comments
 (0)