Skip to content

K
k3s
Commit 3683e0a6 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #39610 from deads2k/generic-17-move-tests

Automatic merge from submit-queue move tests which need to stay in k8s.io/kubernetes for API scheme Preparatory for https://github.com/kubernetes/kubernetes/pull/39475 to keep from having modify packages that will become read-only. It's a straight move of tests which have API scheme dependencies, but lived in the API machinery package.
parents 958466f9 facc34fe
Hide whitespace changes
Inline Side-by-side
Showing with 95 additions and 78 deletions
hack/.linted_packages
View file @ 3683e0a6
......@@ -68,7 +68,6 @@ pkg/api/annotations
pkg/api/errors
pkg/api/events
pkg/api/install
pkg/api/meta
pkg/api/resource
pkg/api/service
pkg/api/v1
......@@ -90,7 +89,6 @@ pkg/apis/componentconfig/install
pkg/apis/extensions/install
pkg/apis/extensions/v1beta1
pkg/apis/imagepolicy/install
pkg/apis/meta/v1/unstructured
pkg/apis/policy/install
pkg/apis/rbac/install
pkg/apis/rbac/v1alpha1
......@@ -239,7 +237,6 @@ pkg/registry/thirdpartyresource
pkg/registry/thirdpartyresource/etcd
pkg/runtime
pkg/runtime/serializer/json
pkg/runtime/serializer/protobuf
pkg/runtime/serializer/recognizer/testing
pkg/runtime/serializer/versioning
pkg/runtime/serializer/yaml
......
pkg/api/meta/BUILD
View file @ 3683e0a6
......@@ -51,30 +51,6 @@ go_test(
],
)
go_test(
name = "go_default_xtest",
srcs = [
"help_test.go",
"meta_test.go",
"scheme_test.go",
],
tags = ["automanaged"],
deps = [
"//pkg/api:go_default_library",
"//pkg/api/meta:go_default_library",
"//pkg/api/testapi:go_default_library",
"//pkg/api/v1:go_default_library",
"//pkg/apis/meta/v1:go_default_library",
"//pkg/apis/meta/v1/unstructured:go_default_library",
"//pkg/runtime:go_default_library",
"//pkg/runtime/schema:go_default_library",
"//pkg/types:go_default_library",
"//pkg/util/diff:go_default_library",
"//pkg/util/sets:go_default_library",
"//vendor:github.com/google/gofuzz",
],
)
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
......
pkg/apimachinery/BUILD
View file @ 3683e0a6
......@@ -43,6 +43,7 @@ filegroup(
":package-srcs",
"//pkg/apimachinery/announced:all-srcs",
"//pkg/apimachinery/registered:all-srcs",
"//pkg/apimachinery/tests:all-srcs",
],
tags = ["automanaged"],
)
pkg/apimachinery/tests/BUILD 0 → 100644
View file @ 3683e0a6
package(default_visibility = ["//visibility:public"])
licenses(["notice"])
load(
"@io_bazel_rules_go//go:def.bzl",
"go_library",
"go_test",
)
go_test(
name = "go_default_test",
srcs = [
"api_meta_help_test.go",
"api_meta_meta_test.go",
"api_meta_scheme_test.go",
"apis_meta_v1_unstructed_unstructure_test.go",
"runtime_helper_test.go",
"runtime_serializer_protobuf_protobuf_test.go",
"runtime_unversioned_test.go",
"watch_until_test.go",
],
library = ":go_default_library",
tags = ["automanaged"],
deps = [
"//pkg/api:go_default_library",
"//pkg/api/install:go_default_library",
"//pkg/api/meta:go_default_library",
"//pkg/api/testapi:go_default_library",
"//pkg/api/v1:go_default_library",
"//pkg/api/validation:go_default_library",
"//pkg/apimachinery/registered:go_default_library",
"//pkg/apis/extensions:go_default_library",
"//pkg/apis/meta/v1:go_default_library",
"//pkg/apis/meta/v1/unstructured:go_default_library",
"//pkg/runtime:go_default_library",
"//pkg/runtime/schema:go_default_library",
"//pkg/runtime/serializer/protobuf:go_default_library",
"//pkg/types:go_default_library",
"//pkg/util/diff:go_default_library",
"//pkg/util/sets:go_default_library",
"//pkg/util/wait:go_default_library",
"//pkg/watch:go_default_library",
"//vendor:github.com/google/gofuzz",
],
)
go_library(
name = "go_default_library",
srcs = ["doc.go"],
tags = ["automanaged"],
)
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
tags = ["automanaged"],
visibility = ["//visibility:private"],
)
filegroup(
name = "all-srcs",
srcs = [":package-srcs"],
tags = ["automanaged"],
)
pkg/api/meta/help_test.go → pkg/apimachinery/tests/api_meta_help_test.go
View file @ 3683e0a6
......@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package meta_test
package tests
import (
"reflect"
......
pkg/api/meta/meta_test.go → pkg/apimachinery/tests/api_meta_meta_test.go
View file @ 3683e0a6
......@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package meta_test
package tests
import (
"reflect"
......
pkg/api/meta/scheme_test.go → pkg/apimachinery/tests/api_meta_scheme_test.go
View file @ 3683e0a6
......@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package meta_test
package tests
import (
"fmt"
......
pkg/apis/meta/v1/unstructured/unstructured_test.go → pkg/apimachinery/tests/apis_meta_v1_unstructed_unstructure_test.go
View file @ 3683e0a6
......@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package unstructured_test
package tests
import (
"fmt"
......
pkg/apimachinery/tests/doc.go 0 → 100644
View file @ 3683e0a6
/*
Copyright 2017 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
// This package runs tests against the apimachinery which require a Scheme
// TODO Refactor the base types into the machinery and move these tests back.
// See https://github.com/kubernetes/kubernetes/issues/39611
package tests
pkg/runtime/helper_test.go → pkg/apimachinery/tests/runtime_helper_test.go
View file @ 3683e0a6
......@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package runtime_test
package tests
import (
"testing"
......
pkg/runtime/serializer/protobuf/protobuf_test.go → pkg/apimachinery/tests/runtime_serializer_protobuf_protobuf_test.go
View file @ 3683e0a6
......@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package protobuf_test
package tests
import (
"bytes"
......@@ -190,7 +190,7 @@ func TestEncode(t *testing.T) {
}
}
func TestDecode(t *testing.T) {
func TestProtobufDecode(t *testing.T) {
wire1 := []byte{
0x6b, 0x38, 0x73, 0x00, // prefix
0x0a, 0x04,
......
pkg/runtime/unversioned_test.go → pkg/apimachinery/tests/runtime_unversioned_test.go
View file @ 3683e0a6
......@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package runtime_test
package tests
import (
"encoding/json"
......
pkg/watch/until_test.go → pkg/apimachinery/tests/watch_until_test.go
View file @ 3683e0a6
......@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package watch_test
package tests
import (
"errors"
......
pkg/apis/meta/v1/unstructured/BUILD
View file @ 3683e0a6
......@@ -5,7 +5,6 @@ licenses(["notice"])
load(
"@io_bazel_rules_go//go:def.bzl",
"go_library",
"go_test",
)
go_library(
......@@ -22,22 +21,6 @@ go_library(
],
)
go_test(
name = "go_default_xtest",
srcs = ["unstructured_test.go"],
tags = ["automanaged"],
deps = [
"//pkg/api:go_default_library",
"//pkg/api/testapi:go_default_library",
"//pkg/api/validation:go_default_library",
"//pkg/apimachinery/registered:go_default_library",
"//pkg/apis/meta/v1:go_default_library",
"//pkg/apis/meta/v1/unstructured:go_default_library",
"//pkg/runtime:go_default_library",
"//pkg/types:go_default_library",
],
)
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
......
pkg/runtime/BUILD
View file @ 3683e0a6
......@@ -52,18 +52,11 @@ go_test(
"conversion_test.go",
"embedded_test.go",
"extension_test.go",
"helper_test.go",
"scheme_test.go",
"unversioned_test.go",
],
tags = ["automanaged"],
deps = [
"//pkg/api:go_default_library",
"//pkg/api/meta:go_default_library",
"//pkg/api/testapi:go_default_library",
"//pkg/apimachinery/registered:go_default_library",
"//pkg/apis/extensions:go_default_library",
"//pkg/apis/meta/v1:go_default_library",
"//pkg/conversion:go_default_library",
"//pkg/runtime:go_default_library",
"//pkg/runtime/schema:go_default_library",
......
pkg/runtime/serializer/protobuf/BUILD
View file @ 3683e0a6
......@@ -5,7 +5,6 @@ licenses(["notice"])
load(
"@io_bazel_rules_go//go:def.bzl",
"go_library",
"go_test",
)
go_library(
......@@ -24,21 +23,6 @@ go_library(
],
)
go_test(
name = "go_default_xtest",
srcs = ["protobuf_test.go"],
tags = ["automanaged"],
deps = [
"//pkg/api:go_default_library",
"//pkg/api/install:go_default_library",
"//pkg/api/v1:go_default_library",
"//pkg/runtime:go_default_library",
"//pkg/runtime/schema:go_default_library",
"//pkg/runtime/serializer/protobuf:go_default_library",
"//pkg/util/diff:go_default_library",
],
)
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
......
pkg/watch/BUILD
View file @ 3683e0a6
......@@ -35,12 +35,10 @@ go_test(
"filter_test.go",
"mux_test.go",
"streamwatcher_test.go",
"until_test.go",
"watch_test.go",
],
tags = ["automanaged"],
deps = [
"//pkg/api:go_default_library",
"//pkg/runtime:go_default_library",
"//pkg/runtime/schema:go_default_library",
"//pkg/util/wait:go_default_library",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment