From 4ce97d6c48ae4735463f020430dd20539a03e8c5 Mon Sep 17 00:00:00 2001
From: Sean Sullivan <seans@google.com>
Date: Thu, 31 Oct 2019 13:40:02 -0700
Subject: [PATCH] Rename test/data directory to testdata

---
 staging/src/k8s.io/kubectl/BUILD              |  2 +-
 .../k8s.io/kubectl/pkg/apply/strategy/BUILD   |  2 +-
 .../kubectl/pkg/apply/strategy/utils_test.go  |  2 +-
 .../src/k8s.io/kubectl/pkg/cmd/annotate/BUILD |  2 +-
 .../kubectl/pkg/cmd/annotate/annotate_test.go |  4 +--
 .../src/k8s.io/kubectl/pkg/cmd/apply/BUILD    |  2 +-
 .../kubectl/pkg/cmd/apply/apply_test.go       | 34 +++++++++----------
 .../src/k8s.io/kubectl/pkg/cmd/create/BUILD   |  2 +-
 .../kubectl/pkg/cmd/create/create_test.go     |  8 ++---
 .../src/k8s.io/kubectl/pkg/cmd/delete/BUILD   |  2 +-
 .../kubectl/pkg/cmd/delete/delete_test.go     | 14 ++++----
 .../src/k8s.io/kubectl/pkg/cmd/describe/BUILD |  2 +-
 .../kubectl/pkg/cmd/describe/describe_test.go |  2 +-
 .../src/k8s.io/kubectl/pkg/cmd/expose/BUILD   |  2 +-
 .../kubectl/pkg/cmd/expose/expose_test.go     |  2 +-
 staging/src/k8s.io/kubectl/pkg/cmd/get/BUILD  |  2 +-
 .../k8s.io/kubectl/pkg/cmd/get/get_test.go    |  9 +++--
 .../src/k8s.io/kubectl/pkg/cmd/label/BUILD    |  2 +-
 .../kubectl/pkg/cmd/label/label_test.go       |  4 +--
 .../src/k8s.io/kubectl/pkg/cmd/patch/BUILD    |  2 +-
 .../kubectl/pkg/cmd/patch/patch_test.go       |  4 +--
 .../src/k8s.io/kubectl/pkg/cmd/replace/BUILD  |  2 +-
 .../kubectl/pkg/cmd/replace/replace_test.go   | 10 +++---
 staging/src/k8s.io/kubectl/pkg/cmd/set/BUILD  |  2 +-
 .../kubectl/pkg/cmd/set/set_env_test.go       |  6 ++--
 .../kubectl/pkg/cmd/set/set_image_test.go     |  4 +--
 .../kubectl/pkg/cmd/set/set_resources_test.go |  4 +--
 .../pkg/cmd/set/set_serviceaccount_test.go    | 12 +++----
 .../src/k8s.io/kubectl/pkg/util/openapi/BUILD |  2 +-
 .../kubectl/pkg/util/openapi/openapi_test.go  |  2 +-
 .../kubectl/pkg/util/openapi/validation/BUILD |  2 +-
 .../openapi/validation/validation_test.go     |  2 +-
 .../kubectl/{test/data => testdata}/BUILD     |  2 +-
 .../{test/data => testdata}/apply/cm.yaml     |  0
 .../apply/deploy-clientside.yaml              |  0
 .../apply/deploy-serverside.yaml              |  0
 .../{test/data => testdata}/apply/patch.json  |  0
 .../data => testdata}/apply/rc-args.yaml      |  0
 .../apply/rc-lastapplied-args.yaml            |  0
 .../apply/rc-lastapplied.yaml                 |  0
 .../apply/rc-no-annotation.yaml               |  0
 .../data => testdata}/apply/rc-noexist.yaml   |  0
 .../data => testdata}/apply/rc-service.yaml   |  0
 .../{test/data => testdata}/apply/rc.json     |  0
 .../{test/data => testdata}/apply/rc.yaml     |  0
 .../data => testdata}/apply/service.yaml      |  0
 .../data => testdata}/apply/testdir/rc.yaml   |  0
 .../data => testdata}/apply/testdir/rc1.yaml  |  0
 .../apply/widget-clientside.yaml              |  0
 .../apply/widget-serverside.yaml              |  0
 .../{test/data => testdata}/controller.yaml   |  0
 .../data => testdata}/frontend-service.yaml   |  0
 .../data => testdata}/openapi/swagger.json    |  0
 .../redis-master-controller.yaml              |  0
 .../redis-master-service.yaml                 |  0
 .../replace/legacy/frontend-controller.yaml   |  0
 .../legacy/redis-master-controller.yaml       |  0
 .../legacy/redis-slave-controller.yaml        |  0
 .../{test/data => testdata}/set/daemon.yaml   |  0
 .../data => testdata}/set/deployment.yaml     |  0
 .../{test/data => testdata}/set/job.yaml      |  0
 .../set/multi-resource-yaml.yaml              |  0
 .../set/namespaced-resource.yaml              |  0
 .../data => testdata}/set/redis-slave.yaml    |  0
 .../data => testdata}/set/replication.yaml    |  0
 65 files changed, 77 insertions(+), 78 deletions(-)
 rename staging/src/k8s.io/kubectl/{test/data => testdata}/BUILD (94%)
 rename staging/src/k8s.io/kubectl/{test/data => testdata}/apply/cm.yaml (100%)
 rename staging/src/k8s.io/kubectl/{test/data => testdata}/apply/deploy-clientside.yaml (100%)
 rename staging/src/k8s.io/kubectl/{test/data => testdata}/apply/deploy-serverside.yaml (100%)
 rename staging/src/k8s.io/kubectl/{test/data => testdata}/apply/patch.json (100%)
 rename staging/src/k8s.io/kubectl/{test/data => testdata}/apply/rc-args.yaml (100%)
 rename staging/src/k8s.io/kubectl/{test/data => testdata}/apply/rc-lastapplied-args.yaml (100%)
 rename staging/src/k8s.io/kubectl/{test/data => testdata}/apply/rc-lastapplied.yaml (100%)
 rename staging/src/k8s.io/kubectl/{test/data => testdata}/apply/rc-no-annotation.yaml (100%)
 rename staging/src/k8s.io/kubectl/{test/data => testdata}/apply/rc-noexist.yaml (100%)
 rename staging/src/k8s.io/kubectl/{test/data => testdata}/apply/rc-service.yaml (100%)
 rename staging/src/k8s.io/kubectl/{test/data => testdata}/apply/rc.json (100%)
 rename staging/src/k8s.io/kubectl/{test/data => testdata}/apply/rc.yaml (100%)
 rename staging/src/k8s.io/kubectl/{test/data => testdata}/apply/service.yaml (100%)
 rename staging/src/k8s.io/kubectl/{test/data => testdata}/apply/testdir/rc.yaml (100%)
 rename staging/src/k8s.io/kubectl/{test/data => testdata}/apply/testdir/rc1.yaml (100%)
 rename staging/src/k8s.io/kubectl/{test/data => testdata}/apply/widget-clientside.yaml (100%)
 rename staging/src/k8s.io/kubectl/{test/data => testdata}/apply/widget-serverside.yaml (100%)
 rename staging/src/k8s.io/kubectl/{test/data => testdata}/controller.yaml (100%)
 rename staging/src/k8s.io/kubectl/{test/data => testdata}/frontend-service.yaml (100%)
 rename staging/src/k8s.io/kubectl/{test/data => testdata}/openapi/swagger.json (100%)
 rename staging/src/k8s.io/kubectl/{test/data => testdata}/redis-master-controller.yaml (100%)
 rename staging/src/k8s.io/kubectl/{test/data => testdata}/redis-master-service.yaml (100%)
 rename staging/src/k8s.io/kubectl/{test/data => testdata}/replace/legacy/frontend-controller.yaml (100%)
 rename staging/src/k8s.io/kubectl/{test/data => testdata}/replace/legacy/redis-master-controller.yaml (100%)
 rename staging/src/k8s.io/kubectl/{test/data => testdata}/replace/legacy/redis-slave-controller.yaml (100%)
 rename staging/src/k8s.io/kubectl/{test/data => testdata}/set/daemon.yaml (100%)
 rename staging/src/k8s.io/kubectl/{test/data => testdata}/set/deployment.yaml (100%)
 rename staging/src/k8s.io/kubectl/{test/data => testdata}/set/job.yaml (100%)
 rename staging/src/k8s.io/kubectl/{test/data => testdata}/set/multi-resource-yaml.yaml (100%)
 rename staging/src/k8s.io/kubectl/{test/data => testdata}/set/namespaced-resource.yaml (100%)
 rename staging/src/k8s.io/kubectl/{test/data => testdata}/set/redis-slave.yaml (100%)
 rename staging/src/k8s.io/kubectl/{test/data => testdata}/set/replication.yaml (100%)

diff --git a/staging/src/k8s.io/kubectl/BUILD b/staging/src/k8s.io/kubectl/BUILD
index 0378f1977d1..9a15529cb9e 100644
--- a/staging/src/k8s.io/kubectl/BUILD
+++ b/staging/src/k8s.io/kubectl/BUILD
@@ -25,7 +25,7 @@ filegroup(
         "//staging/src/k8s.io/kubectl/pkg/scheme:all-srcs",
         "//staging/src/k8s.io/kubectl/pkg/util:all-srcs",
         "//staging/src/k8s.io/kubectl/pkg/validation:all-srcs",
-        "//staging/src/k8s.io/kubectl/test/data:all-srcs",
+        "//staging/src/k8s.io/kubectl/testdata:all-srcs",
     ],
     tags = ["automanaged"],
     visibility = ["//visibility:public"],
diff --git a/staging/src/k8s.io/kubectl/pkg/apply/strategy/BUILD b/staging/src/k8s.io/kubectl/pkg/apply/strategy/BUILD
index 344d96aa77b..a848da9ecb1 100644
--- a/staging/src/k8s.io/kubectl/pkg/apply/strategy/BUILD
+++ b/staging/src/k8s.io/kubectl/pkg/apply/strategy/BUILD
@@ -33,7 +33,7 @@ go_test(
     ],
     data = [
         "test_swagger.json",
-        "//staging/src/k8s.io/kubectl/test/data",
+        "//staging/src/k8s.io/kubectl/testdata",
     ],
     embed = [":go_default_library"],
     deps = [
diff --git a/staging/src/k8s.io/kubectl/pkg/apply/strategy/utils_test.go b/staging/src/k8s.io/kubectl/pkg/apply/strategy/utils_test.go
index c06a34397d5..fde091fc4a5 100644
--- a/staging/src/k8s.io/kubectl/pkg/apply/strategy/utils_test.go
+++ b/staging/src/k8s.io/kubectl/pkg/apply/strategy/utils_test.go
@@ -37,7 +37,7 @@ const (
 	noConflict  = false
 )
 
-var fakeResources = tst.NewFakeResources(filepath.Join("..", "..", "..", "test", "data", "openapi", "swagger.json"))
+var fakeResources = tst.NewFakeResources(filepath.Join("..", "..", "..", "testdata", "openapi", "swagger.json"))
 
 // run parses the openapi and runs the tests
 func run(instance apply.Strategy, recorded, local, remote, expected map[string]interface{}) {
diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/annotate/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/annotate/BUILD
index fece9753377..664f72a17de 100644
--- a/staging/src/k8s.io/kubectl/pkg/cmd/annotate/BUILD
+++ b/staging/src/k8s.io/kubectl/pkg/cmd/annotate/BUILD
@@ -29,7 +29,7 @@ go_library(
 go_test(
     name = "go_default_test",
     srcs = ["annotate_test.go"],
-    data = ["//staging/src/k8s.io/kubectl/test/data"],
+    data = ["//staging/src/k8s.io/kubectl/testdata"],
     embed = [":go_default_library"],
     deps = [
         "//staging/src/k8s.io/api/core/v1:go_default_library",
diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/annotate/annotate_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/annotate/annotate_test.go
index acbe035886a..883faf62574 100644
--- a/staging/src/k8s.io/kubectl/pkg/cmd/annotate/annotate_test.go
+++ b/staging/src/k8s.io/kubectl/pkg/cmd/annotate/annotate_test.go
@@ -543,7 +543,7 @@ func TestAnnotateObjectFromFile(t *testing.T) {
 	cmd := NewCmdAnnotate("kubectl", tf, iostreams)
 	cmd.SetOutput(bufOut)
 	options := NewAnnotateOptions(iostreams)
-	options.Filenames = []string{"../../../test/data/controller.yaml"}
+	options.Filenames = []string{"../../../testdata/controller.yaml"}
 	args := []string{"a=b", "c-"}
 	if err := options.Complete(tf, cmd, args); err != nil {
 		t.Fatalf("unexpected error: %v", err)
@@ -574,7 +574,7 @@ func TestAnnotateLocal(t *testing.T) {
 	cmd := NewCmdAnnotate("kubectl", tf, iostreams)
 	options := NewAnnotateOptions(iostreams)
 	options.local = true
-	options.Filenames = []string{"../../../test/data/controller.yaml"}
+	options.Filenames = []string{"../../../testdata/controller.yaml"}
 	args := []string{"a=b"}
 	if err := options.Complete(tf, cmd, args); err != nil {
 		t.Fatalf("unexpected error: %v", err)
diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/apply/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/apply/BUILD
index d82f63e524f..6fcd40be5f6 100644
--- a/staging/src/k8s.io/kubectl/pkg/cmd/apply/BUILD
+++ b/staging/src/k8s.io/kubectl/pkg/cmd/apply/BUILD
@@ -50,7 +50,7 @@ go_library(
 go_test(
     name = "go_default_test",
     srcs = ["apply_test.go"],
-    data = ["//staging/src/k8s.io/kubectl/test/data"],
+    data = ["//staging/src/k8s.io/kubectl/testdata"],
     embed = [":go_default_library"],
     deps = [
         "//staging/src/k8s.io/api/apps/v1:go_default_library",
diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply_test.go
index 0e92a3971ce..ed66f5f62d9 100644
--- a/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply_test.go
+++ b/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply_test.go
@@ -54,7 +54,7 @@ import (
 )
 
 var (
-	fakeSchema                 = sptest.Fake{Path: filepath.Join("..", "..", "..", "test", "data", "openapi", "swagger.json")}
+	fakeSchema                 = sptest.Fake{Path: filepath.Join("..", "..", "..", "testdata", "openapi", "swagger.json")}
 	testingOpenAPISchemaFns    = []func() (openapi.Resources, error){nil, AlwaysErrorOpenAPISchemaFn, openAPISchemaFn}
 	AlwaysErrorOpenAPISchemaFn = func() (openapi.Resources, error) {
 		return nil, errors.New("cannot get openapi spec")
@@ -87,23 +87,23 @@ func validateApplyArgs(cmd *cobra.Command, args []string) error {
 }
 
 const (
-	filenameCM                = "../../../test/data/apply/cm.yaml"
-	filenameRC                = "../../../test/data/apply/rc.yaml"
-	filenameRCArgs            = "../../../test/data/apply/rc-args.yaml"
-	filenameRCLastAppliedArgs = "../../../test/data/apply/rc-lastapplied-args.yaml"
-	filenameRCNoAnnotation    = "../../../test/data/apply/rc-no-annotation.yaml"
-	filenameRCLASTAPPLIED     = "../../../test/data/apply/rc-lastapplied.yaml"
-	filenameSVC               = "../../../test/data/apply/service.yaml"
-	filenameRCSVC             = "../../../test/data/apply/rc-service.yaml"
-	filenameNoExistRC         = "../../../test/data/apply/rc-noexist.yaml"
-	filenameRCPatchTest       = "../../../test/data/apply/patch.json"
-	dirName                   = "../../../test/data/apply/testdir"
-	filenameRCJSON            = "../../../test/data/apply/rc.json"
+	filenameCM                = "../../../testdata/apply/cm.yaml"
+	filenameRC                = "../../../testdata/apply/rc.yaml"
+	filenameRCArgs            = "../../../testdata/apply/rc-args.yaml"
+	filenameRCLastAppliedArgs = "../../../testdata/apply/rc-lastapplied-args.yaml"
+	filenameRCNoAnnotation    = "../../../testdata/apply/rc-no-annotation.yaml"
+	filenameRCLASTAPPLIED     = "../../../testdata/apply/rc-lastapplied.yaml"
+	filenameSVC               = "../../../testdata/apply/service.yaml"
+	filenameRCSVC             = "../../../testdata/apply/rc-service.yaml"
+	filenameNoExistRC         = "../../../testdata/apply/rc-noexist.yaml"
+	filenameRCPatchTest       = "../../../testdata/apply/patch.json"
+	dirName                   = "../../../testdata/apply/testdir"
+	filenameRCJSON            = "../../../testdata/apply/rc.json"
 
-	filenameWidgetClientside    = "../../../test/data/apply/widget-clientside.yaml"
-	filenameWidgetServerside    = "../../../test/data/apply/widget-serverside.yaml"
-	filenameDeployObjServerside = "../../../test/data/apply/deploy-serverside.yaml"
-	filenameDeployObjClientside = "../../../test/data/apply/deploy-clientside.yaml"
+	filenameWidgetClientside    = "../../../testdata/apply/widget-clientside.yaml"
+	filenameWidgetServerside    = "../../../testdata/apply/widget-serverside.yaml"
+	filenameDeployObjServerside = "../../../testdata/apply/deploy-serverside.yaml"
+	filenameDeployObjClientside = "../../../testdata/apply/deploy-clientside.yaml"
 )
 
 func readConfigMapList(t *testing.T, filename string) [][]byte {
diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/create/BUILD
index 4d34881f4bb..1795f2c888a 100644
--- a/staging/src/k8s.io/kubectl/pkg/cmd/create/BUILD
+++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/BUILD
@@ -77,7 +77,7 @@ go_test(
         "create_serviceaccount_test.go",
         "create_test.go",
     ],
-    data = ["//staging/src/k8s.io/kubectl/test/data"],
+    data = ["//staging/src/k8s.io/kubectl/testdata"],
     embed = [":go_default_library"],
     deps = [
         "//staging/src/k8s.io/api/apps/v1:go_default_library",
diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_test.go
index e817f729953..fdb94cafb49 100644
--- a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_test.go
+++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_test.go
@@ -67,7 +67,7 @@ func TestCreateObject(t *testing.T) {
 
 	ioStreams, _, buf, _ := genericclioptions.NewTestIOStreams()
 	cmd := NewCmdCreate(tf, ioStreams)
-	cmd.Flags().Set("filename", "../../../test/data/redis-master-controller.yaml")
+	cmd.Flags().Set("filename", "../../../testdata/redis-master-controller.yaml")
 	cmd.Flags().Set("output", "name")
 	cmd.Run(cmd, []string{})
 
@@ -104,8 +104,8 @@ func TestCreateMultipleObject(t *testing.T) {
 
 	ioStreams, _, buf, _ := genericclioptions.NewTestIOStreams()
 	cmd := NewCmdCreate(tf, ioStreams)
-	cmd.Flags().Set("filename", "../../../test/data/redis-master-controller.yaml")
-	cmd.Flags().Set("filename", "../../../test/data/frontend-service.yaml")
+	cmd.Flags().Set("filename", "../../../testdata/redis-master-controller.yaml")
+	cmd.Flags().Set("filename", "../../../testdata/frontend-service.yaml")
 	cmd.Flags().Set("output", "name")
 	cmd.Run(cmd, []string{})
 
@@ -141,7 +141,7 @@ func TestCreateDirectory(t *testing.T) {
 
 	ioStreams, _, buf, _ := genericclioptions.NewTestIOStreams()
 	cmd := NewCmdCreate(tf, ioStreams)
-	cmd.Flags().Set("filename", "../../../test/data/replace/legacy")
+	cmd.Flags().Set("filename", "../../../testdata/replace/legacy")
 	cmd.Flags().Set("output", "name")
 	cmd.Run(cmd, []string{})
 
diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/delete/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/delete/BUILD
index 27338c61496..108d231c382 100644
--- a/staging/src/k8s.io/kubectl/pkg/cmd/delete/BUILD
+++ b/staging/src/k8s.io/kubectl/pkg/cmd/delete/BUILD
@@ -31,7 +31,7 @@ go_library(
 go_test(
     name = "go_default_test",
     srcs = ["delete_test.go"],
-    data = ["//staging/src/k8s.io/kubectl/test/data"],
+    data = ["//staging/src/k8s.io/kubectl/testdata"],
     embed = [":go_default_library"],
     deps = [
         "//staging/src/k8s.io/api/core/v1:go_default_library",
diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/delete/delete_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/delete/delete_test.go
index f587060bb45..eae6a028379 100644
--- a/staging/src/k8s.io/kubectl/pkg/cmd/delete/delete_test.go
+++ b/staging/src/k8s.io/kubectl/pkg/cmd/delete/delete_test.go
@@ -237,7 +237,7 @@ func TestDeleteObject(t *testing.T) {
 
 	streams, _, buf, _ := genericclioptions.NewTestIOStreams()
 	cmd := NewCmdDelete(tf, streams)
-	cmd.Flags().Set("filename", "../../../test/data/redis-master-controller.yaml")
+	cmd.Flags().Set("filename", "../../../testdata/redis-master-controller.yaml")
 	cmd.Flags().Set("cascade", "false")
 	cmd.Flags().Set("output", "name")
 	cmd.Run(cmd, []string{})
@@ -317,7 +317,7 @@ func TestDeleteObjectNotFound(t *testing.T) {
 
 	options := &DeleteOptions{
 		FilenameOptions: resource.FilenameOptions{
-			Filenames: []string{"../../../test/data/redis-master-controller.yaml"},
+			Filenames: []string{"../../../testdata/redis-master-controller.yaml"},
 		},
 		GracePeriod: -1,
 		Cascade:     false,
@@ -354,7 +354,7 @@ func TestDeleteObjectIgnoreNotFound(t *testing.T) {
 	streams, _, buf, _ := genericclioptions.NewTestIOStreams()
 
 	cmd := NewCmdDelete(tf, streams)
-	cmd.Flags().Set("filename", "../../../test/data/redis-master-controller.yaml")
+	cmd.Flags().Set("filename", "../../../testdata/redis-master-controller.yaml")
 	cmd.Flags().Set("cascade", "false")
 	cmd.Flags().Set("ignore-not-found", "true")
 	cmd.Flags().Set("output", "name")
@@ -482,8 +482,8 @@ func TestDeleteMultipleObject(t *testing.T) {
 	streams, _, buf, _ := genericclioptions.NewTestIOStreams()
 
 	cmd := NewCmdDelete(tf, streams)
-	cmd.Flags().Set("filename", "../../../test/data/redis-master-controller.yaml")
-	cmd.Flags().Set("filename", "../../../test/data/frontend-service.yaml")
+	cmd.Flags().Set("filename", "../../../testdata/redis-master-controller.yaml")
+	cmd.Flags().Set("filename", "../../../testdata/frontend-service.yaml")
 	cmd.Flags().Set("cascade", "false")
 	cmd.Flags().Set("output", "name")
 	cmd.Run(cmd, []string{})
@@ -520,7 +520,7 @@ func TestDeleteMultipleObjectContinueOnMissing(t *testing.T) {
 
 	options := &DeleteOptions{
 		FilenameOptions: resource.FilenameOptions{
-			Filenames: []string{"../../../test/data/redis-master-controller.yaml", "../../../test/data/frontend-service.yaml"},
+			Filenames: []string{"../../../testdata/redis-master-controller.yaml", "../../../testdata/frontend-service.yaml"},
 		},
 		GracePeriod: -1,
 		Cascade:     false,
@@ -604,7 +604,7 @@ func TestDeleteDirectory(t *testing.T) {
 	streams, _, buf, _ := genericclioptions.NewTestIOStreams()
 
 	cmd := NewCmdDelete(tf, streams)
-	cmd.Flags().Set("filename", "../../../test/data/replace/legacy")
+	cmd.Flags().Set("filename", "../../../testdata/replace/legacy")
 	cmd.Flags().Set("cascade", "false")
 	cmd.Flags().Set("output", "name")
 	cmd.Run(cmd, []string{})
diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/describe/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/describe/BUILD
index 3e7065bfc2b..6d777870548 100644
--- a/staging/src/k8s.io/kubectl/pkg/cmd/describe/BUILD
+++ b/staging/src/k8s.io/kubectl/pkg/cmd/describe/BUILD
@@ -25,7 +25,7 @@ go_library(
 go_test(
     name = "go_default_test",
     srcs = ["describe_test.go"],
-    data = ["//staging/src/k8s.io/kubectl/test/data"],
+    data = ["//staging/src/k8s.io/kubectl/testdata"],
     embed = [":go_default_library"],
     deps = [
         "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library",
diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/describe/describe_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/describe/describe_test.go
index d758e159f22..a368cfe9517 100644
--- a/staging/src/k8s.io/kubectl/pkg/cmd/describe/describe_test.go
+++ b/staging/src/k8s.io/kubectl/pkg/cmd/describe/describe_test.go
@@ -126,7 +126,7 @@ func TestDescribeObject(t *testing.T) {
 	streams, _, buf, _ := genericclioptions.NewTestIOStreams()
 
 	cmd := NewCmdDescribe("kubectl", tf, streams)
-	cmd.Flags().Set("filename", "../../../test/data/redis-master-controller.yaml")
+	cmd.Flags().Set("filename", "../../../testdata/redis-master-controller.yaml")
 	cmd.Run(cmd, []string{})
 
 	if d.Name != "redis-master" || d.Namespace != "test" {
diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/expose/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/expose/BUILD
index ad2eb448164..43906da8567 100644
--- a/staging/src/k8s.io/kubectl/pkg/cmd/expose/BUILD
+++ b/staging/src/k8s.io/kubectl/pkg/cmd/expose/BUILD
@@ -33,7 +33,7 @@ go_library(
 go_test(
     name = "go_default_test",
     srcs = ["expose_test.go"],
-    data = ["//staging/src/k8s.io/kubectl/test/data"],
+    data = ["//staging/src/k8s.io/kubectl/testdata"],
     embed = [":go_default_library"],
     deps = [
         "//staging/src/k8s.io/api/core/v1:go_default_library",
diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/expose/expose_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/expose/expose_test.go
index 267d5d0c05d..45dfd0fd772 100644
--- a/staging/src/k8s.io/kubectl/pkg/cmd/expose/expose_test.go
+++ b/staging/src/k8s.io/kubectl/pkg/cmd/expose/expose_test.go
@@ -306,7 +306,7 @@ func TestRunExposeService(t *testing.T) {
 					Selector: map[string]string{"app": "go"},
 				},
 			},
-			flags: map[string]string{"filename": "../../../test/data/redis-master-service.yaml", "selector": "func=stream", "protocol": "UDP", "port": "14", "name": "foo", "labels": "svc=test", "dry-run": "true"},
+			flags: map[string]string{"filename": "../../../testdata/redis-master-service.yaml", "selector": "func=stream", "protocol": "UDP", "port": "14", "name": "foo", "labels": "svc=test", "dry-run": "true"},
 			output: &corev1.Service{
 				ObjectMeta: metav1.ObjectMeta{Name: "foo", Labels: map[string]string{"svc": "test"}},
 				Spec: corev1.ServiceSpec{
diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/get/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/get/BUILD
index a919dd09779..96c9a2f2ffa 100644
--- a/staging/src/k8s.io/kubectl/pkg/cmd/get/BUILD
+++ b/staging/src/k8s.io/kubectl/pkg/cmd/get/BUILD
@@ -73,7 +73,7 @@ go_test(
         "humanreadable_flags_test.go",
         "sorter_test.go",
     ],
-    data = ["//staging/src/k8s.io/kubectl/test/data"],
+    data = ["//staging/src/k8s.io/kubectl/testdata"],
     embed = [":go_default_library"],
     deps = [
         "//staging/src/k8s.io/api/apps/v1:go_default_library",
diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/get/get_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/get/get_test.go
index 425220adb8d..767e77c08c0 100644
--- a/staging/src/k8s.io/kubectl/pkg/cmd/get/get_test.go
+++ b/staging/src/k8s.io/kubectl/pkg/cmd/get/get_test.go
@@ -54,8 +54,7 @@ import (
 )
 
 var (
-	openapiSchemaPath = filepath.Join("..", "..", "..", "..", "api", "openapi-spec", "swagger.json")
-
+	openapiSchemaPath  = filepath.Join("..", "..", "..", "testdata", "openapi", "swagger.json")
 	grace              = int64(30)
 	enableServiceLinks = corev1.DefaultEnableServiceLinks
 )
@@ -1079,7 +1078,7 @@ func TestGetObjectsIdentifiedByFile(t *testing.T) {
 	streams, _, buf, _ := genericclioptions.NewTestIOStreams()
 	cmd := NewCmdGet("kubectl", tf, streams)
 	cmd.SetOutput(buf)
-	cmd.Flags().Set("filename", "../../../test/data/controller.yaml")
+	cmd.Flags().Set("filename", "../../../testdata/controller.yaml")
 	cmd.Run(cmd, []string{})
 
 	expected := `NAME   AGE
@@ -1105,7 +1104,7 @@ func TestGetTableObjectsIdentifiedByFile(t *testing.T) {
 	streams, _, buf, _ := genericclioptions.NewTestIOStreams()
 	cmd := NewCmdGet("kubectl", tf, streams)
 	cmd.SetOutput(buf)
-	cmd.Flags().Set("filename", "../../../test/data/controller.yaml")
+	cmd.Flags().Set("filename", "../../../testdata/controller.yaml")
 	cmd.Run(cmd, []string{})
 
 	expected := `NAME   READY   STATUS   RESTARTS   AGE
@@ -2495,7 +2494,7 @@ func TestWatchResourceIdentifiedByFile(t *testing.T) {
 	cmd.SetOutput(buf)
 
 	cmd.Flags().Set("watch", "true")
-	cmd.Flags().Set("filename", "../../../test/data/controller.yaml")
+	cmd.Flags().Set("filename", "../../../testdata/controller.yaml")
 	cmd.Run(cmd, []string{})
 
 	expected := `NAME   AGE
diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/label/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/label/BUILD
index 8b0a1043a07..f482797fb5f 100644
--- a/staging/src/k8s.io/kubectl/pkg/cmd/label/BUILD
+++ b/staging/src/k8s.io/kubectl/pkg/cmd/label/BUILD
@@ -31,7 +31,7 @@ go_library(
 go_test(
     name = "go_default_test",
     srcs = ["label_test.go"],
-    data = ["//staging/src/k8s.io/kubectl/test/data"],
+    data = ["//staging/src/k8s.io/kubectl/testdata"],
     embed = [":go_default_library"],
     deps = [
         "//staging/src/k8s.io/api/core/v1:go_default_library",
diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/label/label_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/label/label_test.go
index f2634167295..066a069c872 100644
--- a/staging/src/k8s.io/kubectl/pkg/cmd/label/label_test.go
+++ b/staging/src/k8s.io/kubectl/pkg/cmd/label/label_test.go
@@ -392,7 +392,7 @@ func TestLabelForResourceFromFile(t *testing.T) {
 	ioStreams, _, buf, _ := genericclioptions.NewTestIOStreams()
 	cmd := NewCmdLabel(tf, ioStreams)
 	opts := NewLabelOptions(ioStreams)
-	opts.Filenames = []string{"../../../test/data/controller.yaml"}
+	opts.Filenames = []string{"../../../testdata/controller.yaml"}
 	err := opts.Complete(tf, cmd, []string{"a=b"})
 	if err == nil {
 		err = opts.Validate()
@@ -424,7 +424,7 @@ func TestLabelLocal(t *testing.T) {
 	ioStreams, _, buf, _ := genericclioptions.NewTestIOStreams()
 	cmd := NewCmdLabel(tf, ioStreams)
 	opts := NewLabelOptions(ioStreams)
-	opts.Filenames = []string{"../../../test/data/controller.yaml"}
+	opts.Filenames = []string{"../../../testdata/controller.yaml"}
 	opts.local = true
 	err := opts.Complete(tf, cmd, []string{"a=b"})
 	if err == nil {
diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/patch/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/patch/BUILD
index 6912d0ef10d..b4eb628d50f 100644
--- a/staging/src/k8s.io/kubectl/pkg/cmd/patch/BUILD
+++ b/staging/src/k8s.io/kubectl/pkg/cmd/patch/BUILD
@@ -31,7 +31,7 @@ go_library(
 go_test(
     name = "go_default_test",
     srcs = ["patch_test.go"],
-    data = ["//staging/src/k8s.io/kubectl/test/data"],
+    data = ["//staging/src/k8s.io/kubectl/testdata"],
     embed = [":go_default_library"],
     deps = [
         "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library",
diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/patch/patch_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/patch/patch_test.go
index ac3335c5a72..fb87dd2479f 100644
--- a/staging/src/k8s.io/kubectl/pkg/cmd/patch/patch_test.go
+++ b/staging/src/k8s.io/kubectl/pkg/cmd/patch/patch_test.go
@@ -95,7 +95,7 @@ func TestPatchObjectFromFile(t *testing.T) {
 	cmd.Flags().Set("namespace", "test")
 	cmd.Flags().Set("patch", `{"spec":{"type":"NodePort"}}`)
 	cmd.Flags().Set("output", "name")
-	cmd.Flags().Set("filename", "../../../test/data/frontend-service.yaml")
+	cmd.Flags().Set("filename", "../../../testdata/frontend-service.yaml")
 	cmd.Run(cmd, []string{})
 
 	// uses the name from the response
@@ -181,7 +181,7 @@ func TestPatchObjectFromFileOutput(t *testing.T) {
 	cmd.Flags().Set("namespace", "test")
 	cmd.Flags().Set("patch", `{"spec":{"type":"NodePort"}}`)
 	cmd.Flags().Set("output", "yaml")
-	cmd.Flags().Set("filename", "../../../test/data/frontend-service.yaml")
+	cmd.Flags().Set("filename", "../../../testdata/frontend-service.yaml")
 	cmd.Run(cmd, []string{})
 
 	t.Log(buf.String())
diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/replace/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/replace/BUILD
index 5bd24eff8c8..139e613314d 100644
--- a/staging/src/k8s.io/kubectl/pkg/cmd/replace/BUILD
+++ b/staging/src/k8s.io/kubectl/pkg/cmd/replace/BUILD
@@ -28,7 +28,7 @@ go_library(
 go_test(
     name = "go_default_test",
     srcs = ["replace_test.go"],
-    data = ["//staging/src/k8s.io/kubectl/test/data"],
+    data = ["//staging/src/k8s.io/kubectl/testdata"],
     embed = [":go_default_library"],
     deps = [
         "//staging/src/k8s.io/api/core/v1:go_default_library",
diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/replace/replace_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/replace/replace_test.go
index e2a2b8f8b09..52b3486f613 100644
--- a/staging/src/k8s.io/kubectl/pkg/cmd/replace/replace_test.go
+++ b/staging/src/k8s.io/kubectl/pkg/cmd/replace/replace_test.go
@@ -65,7 +65,7 @@ func TestReplaceObject(t *testing.T) {
 	streams, _, buf, _ := genericclioptions.NewTestIOStreams()
 
 	cmd := NewCmdReplace(tf, streams)
-	cmd.Flags().Set("filename", "../../../test/data/redis-master-controller.yaml")
+	cmd.Flags().Set("filename", "../../../testdata/redis-master-controller.yaml")
 	cmd.Flags().Set("output", "name")
 	cmd.Run(cmd, []string{})
 
@@ -135,8 +135,8 @@ func TestReplaceMultipleObject(t *testing.T) {
 	streams, _, buf, _ := genericclioptions.NewTestIOStreams()
 
 	cmd := NewCmdReplace(tf, streams)
-	cmd.Flags().Set("filename", "../../../test/data/redis-master-controller.yaml")
-	cmd.Flags().Set("filename", "../../../test/data/frontend-service.yaml")
+	cmd.Flags().Set("filename", "../../../testdata/redis-master-controller.yaml")
+	cmd.Flags().Set("filename", "../../../testdata/frontend-service.yaml")
 	cmd.Flags().Set("output", "name")
 	cmd.Run(cmd, []string{})
 
@@ -192,7 +192,7 @@ func TestReplaceDirectory(t *testing.T) {
 	streams, _, buf, _ := genericclioptions.NewTestIOStreams()
 
 	cmd := NewCmdReplace(tf, streams)
-	cmd.Flags().Set("filename", "../../../test/data/replace/legacy")
+	cmd.Flags().Set("filename", "../../../testdata/replace/legacy")
 	cmd.Flags().Set("namespace", "test")
 	cmd.Flags().Set("output", "name")
 	cmd.Run(cmd, []string{})
@@ -238,7 +238,7 @@ func TestForceReplaceObjectNotFound(t *testing.T) {
 	streams, _, buf, _ := genericclioptions.NewTestIOStreams()
 
 	cmd := NewCmdReplace(tf, streams)
-	cmd.Flags().Set("filename", "../../../test/data/redis-master-controller.yaml")
+	cmd.Flags().Set("filename", "../../../testdata/redis-master-controller.yaml")
 	cmd.Flags().Set("force", "true")
 	cmd.Flags().Set("cascade", "false")
 	cmd.Flags().Set("output", "name")
diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/set/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/set/BUILD
index 169cd35930d..4b1c2cae38f 100644
--- a/staging/src/k8s.io/kubectl/pkg/cmd/set/BUILD
+++ b/staging/src/k8s.io/kubectl/pkg/cmd/set/BUILD
@@ -57,7 +57,7 @@ go_test(
         "set_subject_test.go",
         "set_test.go",
     ],
-    data = ["//staging/src/k8s.io/kubectl/test/data"],
+    data = ["//staging/src/k8s.io/kubectl/testdata"],
     embed = [":go_default_library"],
     deps = [
         "//staging/src/k8s.io/api/apps/v1:go_default_library",
diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_env_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_env_test.go
index 0e6560cc801..a9d1d9e69ae 100644
--- a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_env_test.go
+++ b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_env_test.go
@@ -60,7 +60,7 @@ func TestSetEnvLocal(t *testing.T) {
 	opts := NewEnvOptions(streams)
 	opts.PrintFlags = genericclioptions.NewPrintFlags("").WithDefaultOutput(outputFormat).WithTypeSetter(scheme.Scheme)
 	opts.FilenameOptions = resource.FilenameOptions{
-		Filenames: []string{"../../../test/data/controller.yaml"},
+		Filenames: []string{"../../../testdata/controller.yaml"},
 	}
 	opts.Local = true
 
@@ -97,7 +97,7 @@ func TestSetEnvLocalNamespace(t *testing.T) {
 	opts := NewEnvOptions(streams)
 	opts.PrintFlags = genericclioptions.NewPrintFlags("").WithDefaultOutput(outputFormat).WithTypeSetter(scheme.Scheme)
 	opts.FilenameOptions = resource.FilenameOptions{
-		Filenames: []string{"../../../test/data/set/namespaced-resource.yaml"},
+		Filenames: []string{"../../../testdata/set/namespaced-resource.yaml"},
 	}
 	opts.Local = true
 
@@ -134,7 +134,7 @@ func TestSetMultiResourcesEnvLocal(t *testing.T) {
 	opts := NewEnvOptions(streams)
 	opts.PrintFlags = genericclioptions.NewPrintFlags("").WithDefaultOutput(outputFormat).WithTypeSetter(scheme.Scheme)
 	opts.FilenameOptions = resource.FilenameOptions{
-		Filenames: []string{"../../../test/data/set/multi-resource-yaml.yaml"},
+		Filenames: []string{"../../../testdata/set/multi-resource-yaml.yaml"},
 	}
 	opts.Local = true
 
diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_image_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_image_test.go
index 6cd1ffb29bc..fd7eeefdc0d 100644
--- a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_image_test.go
+++ b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_image_test.go
@@ -67,7 +67,7 @@ func TestImageLocal(t *testing.T) {
 	opts := SetImageOptions{
 		PrintFlags: genericclioptions.NewPrintFlags("").WithDefaultOutput(outputFormat).WithTypeSetter(scheme.Scheme),
 		FilenameOptions: resource.FilenameOptions{
-			Filenames: []string{"../../../test/data/controller.yaml"}},
+			Filenames: []string{"../../../testdata/controller.yaml"}},
 		Local:     true,
 		IOStreams: streams,
 	}
@@ -179,7 +179,7 @@ func TestSetMultiResourcesImageLocal(t *testing.T) {
 	opts := SetImageOptions{
 		PrintFlags: genericclioptions.NewPrintFlags("").WithDefaultOutput(outputFormat).WithTypeSetter(scheme.Scheme),
 		FilenameOptions: resource.FilenameOptions{
-			Filenames: []string{"../../../test/data/set/multi-resource-yaml.yaml"}},
+			Filenames: []string{"../../../testdata/set/multi-resource-yaml.yaml"}},
 		Local:     true,
 		IOStreams: streams,
 	}
diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_resources_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_resources_test.go
index cc8202640ca..0fe25d34902 100644
--- a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_resources_test.go
+++ b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_resources_test.go
@@ -66,7 +66,7 @@ func TestResourcesLocal(t *testing.T) {
 	opts := SetResourcesOptions{
 		PrintFlags: genericclioptions.NewPrintFlags("").WithDefaultOutput(outputFormat).WithTypeSetter(scheme.Scheme),
 		FilenameOptions: resource.FilenameOptions{
-			Filenames: []string{"../../../test/data/controller.yaml"}},
+			Filenames: []string{"../../../testdata/controller.yaml"}},
 		Local:             true,
 		Limits:            "cpu=200m,memory=512Mi",
 		Requests:          "cpu=200m,memory=512Mi",
@@ -114,7 +114,7 @@ func TestSetMultiResourcesLimitsLocal(t *testing.T) {
 	opts := SetResourcesOptions{
 		PrintFlags: genericclioptions.NewPrintFlags("").WithDefaultOutput(outputFormat).WithTypeSetter(scheme.Scheme),
 		FilenameOptions: resource.FilenameOptions{
-			Filenames: []string{"../../../test/data/set/multi-resource-yaml.yaml"}},
+			Filenames: []string{"../../../testdata/set/multi-resource-yaml.yaml"}},
 		Local:             true,
 		Limits:            "cpu=200m,memory=512Mi",
 		Requests:          "cpu=200m,memory=512Mi",
diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_serviceaccount_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_serviceaccount_test.go
index aa7e3dd6366..064b074103d 100644
--- a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_serviceaccount_test.go
+++ b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_serviceaccount_test.go
@@ -57,11 +57,11 @@ func TestSetServiceAccountLocal(t *testing.T) {
 		yaml     string
 		apiGroup string
 	}{
-		{yaml: "../../../test/data/set/replication.yaml", apiGroup: ""},
-		{yaml: "../../../test/data/set/daemon.yaml", apiGroup: "extensions"},
-		{yaml: "../../../test/data/set/redis-slave.yaml", apiGroup: "extensions"},
-		{yaml: "../../../test/data/set/job.yaml", apiGroup: "batch"},
-		{yaml: "../../../test/data/set/deployment.yaml", apiGroup: "extensions"},
+		{yaml: "../../../testdata/set/replication.yaml", apiGroup: ""},
+		{yaml: "../../../testdata/set/daemon.yaml", apiGroup: "extensions"},
+		{yaml: "../../../testdata/set/redis-slave.yaml", apiGroup: "extensions"},
+		{yaml: "../../../testdata/set/job.yaml", apiGroup: "batch"},
+		{yaml: "../../../testdata/set/deployment.yaml", apiGroup: "extensions"},
 	}
 
 	for i, input := range inputs {
@@ -122,7 +122,7 @@ func TestSetServiceAccountMultiLocal(t *testing.T) {
 	opts := SetServiceAccountOptions{
 		PrintFlags: genericclioptions.NewPrintFlags("").WithDefaultOutput(outputFormat).WithTypeSetter(scheme.Scheme),
 		fileNameOptions: resource.FilenameOptions{
-			Filenames: []string{"../../../test/data/set/multi-resource-yaml.yaml"}},
+			Filenames: []string{"../../../testdata/set/multi-resource-yaml.yaml"}},
 		local:     true,
 		IOStreams: streams,
 	}
diff --git a/staging/src/k8s.io/kubectl/pkg/util/openapi/BUILD b/staging/src/k8s.io/kubectl/pkg/util/openapi/BUILD
index 235f4a4e316..d28ea75e5d9 100644
--- a/staging/src/k8s.io/kubectl/pkg/util/openapi/BUILD
+++ b/staging/src/k8s.io/kubectl/pkg/util/openapi/BUILD
@@ -30,7 +30,7 @@ go_test(
         "openapi_suite_test.go",
         "openapi_test.go",
     ],
-    data = ["//staging/src/k8s.io/kubectl/test/data"],
+    data = ["//staging/src/k8s.io/kubectl/testdata"],
     embed = [":go_default_library"],
     deps = [
         "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
diff --git a/staging/src/k8s.io/kubectl/pkg/util/openapi/openapi_test.go b/staging/src/k8s.io/kubectl/pkg/util/openapi/openapi_test.go
index 3a64ed7caa7..d1649d79ce4 100644
--- a/staging/src/k8s.io/kubectl/pkg/util/openapi/openapi_test.go
+++ b/staging/src/k8s.io/kubectl/pkg/util/openapi/openapi_test.go
@@ -28,7 +28,7 @@ import (
 	"k8s.io/kubectl/pkg/util/openapi"
 )
 
-var fakeSchema = testing.Fake{Path: filepath.Join("..", "..", "..", "test", "data", "openapi", "swagger.json")}
+var fakeSchema = testing.Fake{Path: filepath.Join("..", "..", "..", "testdata", "openapi", "swagger.json")}
 
 var _ = Describe("Reading apps/v1beta1/Deployment from openAPIData", func() {
 	var resources openapi.Resources
diff --git a/staging/src/k8s.io/kubectl/pkg/util/openapi/validation/BUILD b/staging/src/k8s.io/kubectl/pkg/util/openapi/validation/BUILD
index f2ede189d79..6e5e6e1be59 100644
--- a/staging/src/k8s.io/kubectl/pkg/util/openapi/validation/BUILD
+++ b/staging/src/k8s.io/kubectl/pkg/util/openapi/validation/BUILD
@@ -22,7 +22,7 @@ go_test(
         "validation_suite_test.go",
         "validation_test.go",
     ],
-    data = ["//staging/src/k8s.io/kubectl/test/data"],
+    data = ["//staging/src/k8s.io/kubectl/testdata"],
     embed = [":go_default_library"],
     deps = [
         "//staging/src/k8s.io/apimachinery/pkg/util/errors:go_default_library",
diff --git a/staging/src/k8s.io/kubectl/pkg/util/openapi/validation/validation_test.go b/staging/src/k8s.io/kubectl/pkg/util/openapi/validation/validation_test.go
index cd4517c39aa..7d8cbc519d2 100644
--- a/staging/src/k8s.io/kubectl/pkg/util/openapi/validation/validation_test.go
+++ b/staging/src/k8s.io/kubectl/pkg/util/openapi/validation/validation_test.go
@@ -30,7 +30,7 @@ import (
 	"k8s.io/kubectl/pkg/util/openapi"
 )
 
-var fakeSchema = testing.Fake{Path: filepath.Join("..", "..", "..", "..", "test", "data", "openapi", "swagger.json")}
+var fakeSchema = testing.Fake{Path: filepath.Join("..", "..", "..", "..", "testdata", "openapi", "swagger.json")}
 
 var _ = Describe("resource validation using OpenAPI Schema", func() {
 	var validator *SchemaValidation
diff --git a/staging/src/k8s.io/kubectl/test/data/BUILD b/staging/src/k8s.io/kubectl/testdata/BUILD
similarity index 94%
rename from staging/src/k8s.io/kubectl/test/data/BUILD
rename to staging/src/k8s.io/kubectl/testdata/BUILD
index ebcce3684ee..f6ee0d379f7 100644
--- a/staging/src/k8s.io/kubectl/test/data/BUILD
+++ b/staging/src/k8s.io/kubectl/testdata/BUILD
@@ -1,7 +1,7 @@
 package(default_visibility = ["//visibility:public"])
 
 filegroup(
-    name = "data",
+    name = "testdata",
     srcs = glob([
         "**/*.yaml",
         "**/*.yml",
diff --git a/staging/src/k8s.io/kubectl/test/data/apply/cm.yaml b/staging/src/k8s.io/kubectl/testdata/apply/cm.yaml
similarity index 100%
rename from staging/src/k8s.io/kubectl/test/data/apply/cm.yaml
rename to staging/src/k8s.io/kubectl/testdata/apply/cm.yaml
diff --git a/staging/src/k8s.io/kubectl/test/data/apply/deploy-clientside.yaml b/staging/src/k8s.io/kubectl/testdata/apply/deploy-clientside.yaml
similarity index 100%
rename from staging/src/k8s.io/kubectl/test/data/apply/deploy-clientside.yaml
rename to staging/src/k8s.io/kubectl/testdata/apply/deploy-clientside.yaml
diff --git a/staging/src/k8s.io/kubectl/test/data/apply/deploy-serverside.yaml b/staging/src/k8s.io/kubectl/testdata/apply/deploy-serverside.yaml
similarity index 100%
rename from staging/src/k8s.io/kubectl/test/data/apply/deploy-serverside.yaml
rename to staging/src/k8s.io/kubectl/testdata/apply/deploy-serverside.yaml
diff --git a/staging/src/k8s.io/kubectl/test/data/apply/patch.json b/staging/src/k8s.io/kubectl/testdata/apply/patch.json
similarity index 100%
rename from staging/src/k8s.io/kubectl/test/data/apply/patch.json
rename to staging/src/k8s.io/kubectl/testdata/apply/patch.json
diff --git a/staging/src/k8s.io/kubectl/test/data/apply/rc-args.yaml b/staging/src/k8s.io/kubectl/testdata/apply/rc-args.yaml
similarity index 100%
rename from staging/src/k8s.io/kubectl/test/data/apply/rc-args.yaml
rename to staging/src/k8s.io/kubectl/testdata/apply/rc-args.yaml
diff --git a/staging/src/k8s.io/kubectl/test/data/apply/rc-lastapplied-args.yaml b/staging/src/k8s.io/kubectl/testdata/apply/rc-lastapplied-args.yaml
similarity index 100%
rename from staging/src/k8s.io/kubectl/test/data/apply/rc-lastapplied-args.yaml
rename to staging/src/k8s.io/kubectl/testdata/apply/rc-lastapplied-args.yaml
diff --git a/staging/src/k8s.io/kubectl/test/data/apply/rc-lastapplied.yaml b/staging/src/k8s.io/kubectl/testdata/apply/rc-lastapplied.yaml
similarity index 100%
rename from staging/src/k8s.io/kubectl/test/data/apply/rc-lastapplied.yaml
rename to staging/src/k8s.io/kubectl/testdata/apply/rc-lastapplied.yaml
diff --git a/staging/src/k8s.io/kubectl/test/data/apply/rc-no-annotation.yaml b/staging/src/k8s.io/kubectl/testdata/apply/rc-no-annotation.yaml
similarity index 100%
rename from staging/src/k8s.io/kubectl/test/data/apply/rc-no-annotation.yaml
rename to staging/src/k8s.io/kubectl/testdata/apply/rc-no-annotation.yaml
diff --git a/staging/src/k8s.io/kubectl/test/data/apply/rc-noexist.yaml b/staging/src/k8s.io/kubectl/testdata/apply/rc-noexist.yaml
similarity index 100%
rename from staging/src/k8s.io/kubectl/test/data/apply/rc-noexist.yaml
rename to staging/src/k8s.io/kubectl/testdata/apply/rc-noexist.yaml
diff --git a/staging/src/k8s.io/kubectl/test/data/apply/rc-service.yaml b/staging/src/k8s.io/kubectl/testdata/apply/rc-service.yaml
similarity index 100%
rename from staging/src/k8s.io/kubectl/test/data/apply/rc-service.yaml
rename to staging/src/k8s.io/kubectl/testdata/apply/rc-service.yaml
diff --git a/staging/src/k8s.io/kubectl/test/data/apply/rc.json b/staging/src/k8s.io/kubectl/testdata/apply/rc.json
similarity index 100%
rename from staging/src/k8s.io/kubectl/test/data/apply/rc.json
rename to staging/src/k8s.io/kubectl/testdata/apply/rc.json
diff --git a/staging/src/k8s.io/kubectl/test/data/apply/rc.yaml b/staging/src/k8s.io/kubectl/testdata/apply/rc.yaml
similarity index 100%
rename from staging/src/k8s.io/kubectl/test/data/apply/rc.yaml
rename to staging/src/k8s.io/kubectl/testdata/apply/rc.yaml
diff --git a/staging/src/k8s.io/kubectl/test/data/apply/service.yaml b/staging/src/k8s.io/kubectl/testdata/apply/service.yaml
similarity index 100%
rename from staging/src/k8s.io/kubectl/test/data/apply/service.yaml
rename to staging/src/k8s.io/kubectl/testdata/apply/service.yaml
diff --git a/staging/src/k8s.io/kubectl/test/data/apply/testdir/rc.yaml b/staging/src/k8s.io/kubectl/testdata/apply/testdir/rc.yaml
similarity index 100%
rename from staging/src/k8s.io/kubectl/test/data/apply/testdir/rc.yaml
rename to staging/src/k8s.io/kubectl/testdata/apply/testdir/rc.yaml
diff --git a/staging/src/k8s.io/kubectl/test/data/apply/testdir/rc1.yaml b/staging/src/k8s.io/kubectl/testdata/apply/testdir/rc1.yaml
similarity index 100%
rename from staging/src/k8s.io/kubectl/test/data/apply/testdir/rc1.yaml
rename to staging/src/k8s.io/kubectl/testdata/apply/testdir/rc1.yaml
diff --git a/staging/src/k8s.io/kubectl/test/data/apply/widget-clientside.yaml b/staging/src/k8s.io/kubectl/testdata/apply/widget-clientside.yaml
similarity index 100%
rename from staging/src/k8s.io/kubectl/test/data/apply/widget-clientside.yaml
rename to staging/src/k8s.io/kubectl/testdata/apply/widget-clientside.yaml
diff --git a/staging/src/k8s.io/kubectl/test/data/apply/widget-serverside.yaml b/staging/src/k8s.io/kubectl/testdata/apply/widget-serverside.yaml
similarity index 100%
rename from staging/src/k8s.io/kubectl/test/data/apply/widget-serverside.yaml
rename to staging/src/k8s.io/kubectl/testdata/apply/widget-serverside.yaml
diff --git a/staging/src/k8s.io/kubectl/test/data/controller.yaml b/staging/src/k8s.io/kubectl/testdata/controller.yaml
similarity index 100%
rename from staging/src/k8s.io/kubectl/test/data/controller.yaml
rename to staging/src/k8s.io/kubectl/testdata/controller.yaml
diff --git a/staging/src/k8s.io/kubectl/test/data/frontend-service.yaml b/staging/src/k8s.io/kubectl/testdata/frontend-service.yaml
similarity index 100%
rename from staging/src/k8s.io/kubectl/test/data/frontend-service.yaml
rename to staging/src/k8s.io/kubectl/testdata/frontend-service.yaml
diff --git a/staging/src/k8s.io/kubectl/test/data/openapi/swagger.json b/staging/src/k8s.io/kubectl/testdata/openapi/swagger.json
similarity index 100%
rename from staging/src/k8s.io/kubectl/test/data/openapi/swagger.json
rename to staging/src/k8s.io/kubectl/testdata/openapi/swagger.json
diff --git a/staging/src/k8s.io/kubectl/test/data/redis-master-controller.yaml b/staging/src/k8s.io/kubectl/testdata/redis-master-controller.yaml
similarity index 100%
rename from staging/src/k8s.io/kubectl/test/data/redis-master-controller.yaml
rename to staging/src/k8s.io/kubectl/testdata/redis-master-controller.yaml
diff --git a/staging/src/k8s.io/kubectl/test/data/redis-master-service.yaml b/staging/src/k8s.io/kubectl/testdata/redis-master-service.yaml
similarity index 100%
rename from staging/src/k8s.io/kubectl/test/data/redis-master-service.yaml
rename to staging/src/k8s.io/kubectl/testdata/redis-master-service.yaml
diff --git a/staging/src/k8s.io/kubectl/test/data/replace/legacy/frontend-controller.yaml b/staging/src/k8s.io/kubectl/testdata/replace/legacy/frontend-controller.yaml
similarity index 100%
rename from staging/src/k8s.io/kubectl/test/data/replace/legacy/frontend-controller.yaml
rename to staging/src/k8s.io/kubectl/testdata/replace/legacy/frontend-controller.yaml
diff --git a/staging/src/k8s.io/kubectl/test/data/replace/legacy/redis-master-controller.yaml b/staging/src/k8s.io/kubectl/testdata/replace/legacy/redis-master-controller.yaml
similarity index 100%
rename from staging/src/k8s.io/kubectl/test/data/replace/legacy/redis-master-controller.yaml
rename to staging/src/k8s.io/kubectl/testdata/replace/legacy/redis-master-controller.yaml
diff --git a/staging/src/k8s.io/kubectl/test/data/replace/legacy/redis-slave-controller.yaml b/staging/src/k8s.io/kubectl/testdata/replace/legacy/redis-slave-controller.yaml
similarity index 100%
rename from staging/src/k8s.io/kubectl/test/data/replace/legacy/redis-slave-controller.yaml
rename to staging/src/k8s.io/kubectl/testdata/replace/legacy/redis-slave-controller.yaml
diff --git a/staging/src/k8s.io/kubectl/test/data/set/daemon.yaml b/staging/src/k8s.io/kubectl/testdata/set/daemon.yaml
similarity index 100%
rename from staging/src/k8s.io/kubectl/test/data/set/daemon.yaml
rename to staging/src/k8s.io/kubectl/testdata/set/daemon.yaml
diff --git a/staging/src/k8s.io/kubectl/test/data/set/deployment.yaml b/staging/src/k8s.io/kubectl/testdata/set/deployment.yaml
similarity index 100%
rename from staging/src/k8s.io/kubectl/test/data/set/deployment.yaml
rename to staging/src/k8s.io/kubectl/testdata/set/deployment.yaml
diff --git a/staging/src/k8s.io/kubectl/test/data/set/job.yaml b/staging/src/k8s.io/kubectl/testdata/set/job.yaml
similarity index 100%
rename from staging/src/k8s.io/kubectl/test/data/set/job.yaml
rename to staging/src/k8s.io/kubectl/testdata/set/job.yaml
diff --git a/staging/src/k8s.io/kubectl/test/data/set/multi-resource-yaml.yaml b/staging/src/k8s.io/kubectl/testdata/set/multi-resource-yaml.yaml
similarity index 100%
rename from staging/src/k8s.io/kubectl/test/data/set/multi-resource-yaml.yaml
rename to staging/src/k8s.io/kubectl/testdata/set/multi-resource-yaml.yaml
diff --git a/staging/src/k8s.io/kubectl/test/data/set/namespaced-resource.yaml b/staging/src/k8s.io/kubectl/testdata/set/namespaced-resource.yaml
similarity index 100%
rename from staging/src/k8s.io/kubectl/test/data/set/namespaced-resource.yaml
rename to staging/src/k8s.io/kubectl/testdata/set/namespaced-resource.yaml
diff --git a/staging/src/k8s.io/kubectl/test/data/set/redis-slave.yaml b/staging/src/k8s.io/kubectl/testdata/set/redis-slave.yaml
similarity index 100%
rename from staging/src/k8s.io/kubectl/test/data/set/redis-slave.yaml
rename to staging/src/k8s.io/kubectl/testdata/set/redis-slave.yaml
diff --git a/staging/src/k8s.io/kubectl/test/data/set/replication.yaml b/staging/src/k8s.io/kubectl/testdata/set/replication.yaml
similarity index 100%
rename from staging/src/k8s.io/kubectl/test/data/set/replication.yaml
rename to staging/src/k8s.io/kubectl/testdata/set/replication.yaml