Skip to content

Commit f1cbbda

Browse files
authored
Merge pull request kubernetes#86650 from RainbowMango/pr_testapi_cleanup
Cleanup testapi after it has been removed
2 parents 0387ee4 + eea91c0 commit f1cbbda

File tree

3 files changed

+2
-5
lines changed

3 files changed

+2
-5
lines changed

pkg/api/testing/serialization_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ var nonRoundTrippableTypes = sets.NewString(
170170
var commonKinds = []string{"Status", "ListOptions", "DeleteOptions", "ExportOptions", "GetOptions", "CreateOptions", "UpdateOptions", "PatchOptions"}
171171

172172
// TestCommonKindsRegistered verifies that all group/versions registered with
173-
// the testapi package have the common kinds.
173+
// the legacyscheme package have the common kinds.
174174
func TestCommonKindsRegistered(t *testing.T) {
175175
gvs := map[schema.GroupVersion]bool{}
176176
for gvk := range legacyscheme.Scheme.AllKnownTypes() {
@@ -213,7 +213,7 @@ func TestCommonKindsRegistered(t *testing.T) {
213213
}
214214

215215
// TestRoundTripTypes applies the round-trip test to all round-trippable Kinds
216-
// in all of the API groups registered for test in the testapi package.
216+
// in all of the API groups registered for test in the legacyscheme package.
217217
func TestRoundTripTypes(t *testing.T) {
218218
seed := rand.Int63()
219219
fuzzer := fuzzer.FuzzerFor(FuzzerFuncs, rand.NewSource(seed), legacyscheme.Codecs)

pkg/apis/core/install/install_test.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,6 @@ func TestResourceVersioner(t *testing.T) {
5151

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

staging/publishing/import-restrictions.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
# Main goal: pkg/apis should be as self-contained as possible.
1717
- k8s.io/kubernetes/pkg/apis/apps
1818
- k8s.io/kubernetes/pkg/api/legacyscheme
19-
- k8s.io/kubernetes/pkg/api/testapi
2019
- k8s.io/api/apps/v1
2120
ignoredSubTrees:
2221
- "./pkg/apis/core/validation"

0 commit comments

Comments
 (0)