From 466acf62e34776dc9c38b660477a9761ac20d141 Mon Sep 17 00:00:00 2001 From: wojtekt Date: Tue, 7 Apr 2020 14:12:13 +0200 Subject: [PATCH] Move unstructured test to better place --- .../pkg/apis/meta/v1/unstructured/BUILD | 5 ++++ .../unstructured_conversion_test.go | 2 +- .../k8s.io/apimachinery/pkg/conversion/BUILD | 1 - .../pkg/conversion/unstructured/BUILD | 30 ------------------- 4 files changed, 6 insertions(+), 32 deletions(-) rename staging/src/k8s.io/apimachinery/pkg/{conversion => apis/meta/v1}/unstructured/unstructured_conversion_test.go (99%) delete mode 100644 staging/src/k8s.io/apimachinery/pkg/conversion/unstructured/BUILD diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured/BUILD b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured/BUILD index 47046794675..1d5c3681253 100644 --- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured/BUILD +++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured/BUILD @@ -10,6 +10,7 @@ go_test( name = "go_default_test", srcs = [ "helpers_test.go", + "unstructured_conversion_test.go", "unstructured_list_test.go", "unstructured_test.go", ], @@ -19,9 +20,13 @@ go_test( "//staging/src/k8s.io/apimachinery/pkg/api/equality:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/fuzzer:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/apis/testapigroup:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/apis/testapigroup/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/testing:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/test:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/diff:go_default_library", "//vendor/github.com/stretchr/testify/assert:go_default_library", "//vendor/github.com/stretchr/testify/require:go_default_library", diff --git a/staging/src/k8s.io/apimachinery/pkg/conversion/unstructured/unstructured_conversion_test.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured/unstructured_conversion_test.go similarity index 99% rename from staging/src/k8s.io/apimachinery/pkg/conversion/unstructured/unstructured_conversion_test.go rename to staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured/unstructured_conversion_test.go index e1d52373a7a..bed4a0f2f95 100644 --- a/staging/src/k8s.io/apimachinery/pkg/conversion/unstructured/unstructured_conversion_test.go +++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured/unstructured_conversion_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package test +package unstructured_test import ( "fmt" diff --git a/staging/src/k8s.io/apimachinery/pkg/conversion/BUILD b/staging/src/k8s.io/apimachinery/pkg/conversion/BUILD index 6b5f68b39c0..29a2adee0da 100644 --- a/staging/src/k8s.io/apimachinery/pkg/conversion/BUILD +++ b/staging/src/k8s.io/apimachinery/pkg/conversion/BUILD @@ -45,7 +45,6 @@ filegroup( srcs = [ ":package-srcs", "//staging/src/k8s.io/apimachinery/pkg/conversion/queryparams:all-srcs", - "//staging/src/k8s.io/apimachinery/pkg/conversion/unstructured:all-srcs", ], tags = ["automanaged"], ) diff --git a/staging/src/k8s.io/apimachinery/pkg/conversion/unstructured/BUILD b/staging/src/k8s.io/apimachinery/pkg/conversion/unstructured/BUILD deleted file mode 100644 index e45f652343f..00000000000 --- a/staging/src/k8s.io/apimachinery/pkg/conversion/unstructured/BUILD +++ /dev/null @@ -1,30 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_test") - -go_test( - name = "go_default_test", - srcs = ["unstructured_conversion_test.go"], - deps = [ - "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/apis/testapigroup:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/apis/testapigroup/v1:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/test:go_default_library", - "//vendor/github.com/stretchr/testify/assert:go_default_library", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], - visibility = ["//visibility:public"], -)