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

Cleanup testapi after it has been removed

Browse Source
This commit is contained in:
RainbowMango 2019-12-27 10:27:12 +08:00
parent 13133857af
commit eea91c018b
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -170,7 +170,7 @@ var nonRoundTrippableTypes = sets.NewString(
var commonKinds = []string{"Status", "ListOptions", "DeleteOptions", "ExportOptions", "GetOptions", "CreateOptions", "UpdateOptions", "PatchOptions"} var commonKinds = []string{"Status", "ListOptions", "DeleteOptions", "ExportOptions", "GetOptions", "CreateOptions", "UpdateOptions", "PatchOptions"}
// TestCommonKindsRegistered verifies that all group/versions registered with // TestCommonKindsRegistered verifies that all group/versions registered with
// the testapi package have the common kinds. // the legacyscheme package have the common kinds.
func TestCommonKindsRegistered(t *testing.T) { func TestCommonKindsRegistered(t *testing.T) {
gvs := map[schema.GroupVersion]bool{} gvs := map[schema.GroupVersion]bool{}
for gvk := range legacyscheme.Scheme.AllKnownTypes() { for gvk := range legacyscheme.Scheme.AllKnownTypes() {
@ -213,7 +213,7 @@ func TestCommonKindsRegistered(t *testing.T) {
} }
// TestRoundTripTypes applies the round-trip test to all round-trippable Kinds // TestRoundTripTypes applies the round-trip test to all round-trippable Kinds
// in all of the API groups registered for test in the testapi package. // in all of the API groups registered for test in the legacyscheme package.
func TestRoundTripTypes(t *testing.T) { func TestRoundTripTypes(t *testing.T) {
seed := rand.Int63() seed := rand.Int63()
fuzzer := fuzzer.FuzzerFor(FuzzerFuncs, rand.NewSource(seed), legacyscheme.Codecs) fuzzer := fuzzer.FuzzerFor(FuzzerFuncs, rand.NewSource(seed), legacyscheme.Codecs)

2
pkg/apis/core/install/install_test.go
View File

@ -51,8 +51,6 @@ func TestResourceVersioner(t *testing.T) {
func TestCodec(t *testing.T) { func TestCodec(t *testing.T) {
pod := internal.Pod{} pod := internal.Pod{}
// We do want to use package registered rather than testapi here, because we
// want to test if the package install and package registered work as expected.
data, err := runtime.Encode(legacyscheme.Codecs.LegacyCodec(schema.GroupVersion{Group: "", Version: "v1"}), &pod) data, err := runtime.Encode(legacyscheme.Codecs.LegacyCodec(schema.GroupVersion{Group: "", Version: "v1"}), &pod)
if err != nil { if err != nil {
t.Fatalf("unexpected error: %v", err) t.Fatalf("unexpected error: %v", err)

1
staging/publishing/import-restrictions.yaml
View File

@ -16,7 +16,6 @@
# Main goal: pkg/apis should be as self-contained as possible. # Main goal: pkg/apis should be as self-contained as possible.
- k8s.io/kubernetes/pkg/apis/apps - k8s.io/kubernetes/pkg/apis/apps
- k8s.io/kubernetes/pkg/api/legacyscheme - k8s.io/kubernetes/pkg/api/legacyscheme
- k8s.io/kubernetes/pkg/api/testapi
- k8s.io/api/apps/v1 - k8s.io/api/apps/v1
ignoredSubTrees: ignoredSubTrees:
- "./pkg/apis/core/validation" - "./pkg/apis/core/validation"