From a570d316b8be8c223f28f9ea94ce64b5c7d45a5a Mon Sep 17 00:00:00 2001 From: shashidharatd Date: Mon, 25 Sep 2017 22:16:02 +0530 Subject: [PATCH] Move k/test/integration/federation to k/federation/test/integration --- .../federation => federation/test/integration}/BUILD | 0 .../federation => federation/test/integration}/OWNERS | 0 .../federation => federation/test/integration}/api_test.go | 4 ++-- .../federation => federation/test/integration}/crud_test.go | 4 ++-- .../test/integration}/framework/BUILD | 0 .../test/integration}/framework/api.go | 0 .../test/integration}/framework/controller.go | 0 .../test/integration}/framework/crudtester.go | 0 .../test/integration}/framework/federation.go | 0 .../test/integration}/framework/util.go | 0 .../federation => federation/test/integration}/main_test.go | 2 +- hack/.golint_failures | 2 +- hack/make-rules/test-integration.sh | 3 +++ hack/make-rules/test.sh | 1 + 14 files changed, 10 insertions(+), 6 deletions(-) rename {test/integration/federation => federation/test/integration}/BUILD (100%) rename {test/integration/federation => federation/test/integration}/OWNERS (100%) rename {test/integration/federation => federation/test/integration}/api_test.go (99%) rename {test/integration/federation => federation/test/integration}/crud_test.go (98%) rename {test/integration/federation => federation/test/integration}/framework/BUILD (100%) rename {test/integration/federation => federation/test/integration}/framework/api.go (100%) rename {test/integration/federation => federation/test/integration}/framework/controller.go (100%) rename {test/integration/federation => federation/test/integration}/framework/crudtester.go (100%) rename {test/integration/federation => federation/test/integration}/framework/federation.go (100%) rename {test/integration/federation => federation/test/integration}/framework/util.go (100%) rename {test/integration/federation => federation/test/integration}/main_test.go (97%) diff --git a/test/integration/federation/BUILD b/federation/test/integration/BUILD similarity index 100% rename from test/integration/federation/BUILD rename to federation/test/integration/BUILD diff --git a/test/integration/federation/OWNERS b/federation/test/integration/OWNERS similarity index 100% rename from test/integration/federation/OWNERS rename to federation/test/integration/OWNERS diff --git a/test/integration/federation/api_test.go b/federation/test/integration/api_test.go similarity index 99% rename from test/integration/federation/api_test.go rename to federation/test/integration/api_test.go index a294e34ad8..b53311e0bb 100644 --- a/test/integration/federation/api_test.go +++ b/federation/test/integration/api_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package federation +package integration import ( "encoding/json" @@ -32,7 +32,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" fed_v1b1 "k8s.io/kubernetes/federation/apis/federation/v1beta1" - "k8s.io/kubernetes/test/integration/federation/framework" + "k8s.io/kubernetes/federation/test/integration/framework" ) // List of group versions that are enabled by default. diff --git a/test/integration/federation/crud_test.go b/federation/test/integration/crud_test.go similarity index 98% rename from test/integration/federation/crud_test.go rename to federation/test/integration/crud_test.go index 5c3fa8b0b2..cd56c09d18 100644 --- a/test/integration/federation/crud_test.go +++ b/federation/test/integration/crud_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package federation +package integration import ( "fmt" @@ -26,7 +26,7 @@ import ( federationapi "k8s.io/kubernetes/federation/apis/federation/v1beta1" "k8s.io/kubernetes/federation/pkg/federatedtypes" "k8s.io/kubernetes/federation/pkg/federatedtypes/crudtester" - "k8s.io/kubernetes/test/integration/federation/framework" + "k8s.io/kubernetes/federation/test/integration/framework" ) // TestFederationCRUD validates create/read/update/delete operations for federated resource types. diff --git a/test/integration/federation/framework/BUILD b/federation/test/integration/framework/BUILD similarity index 100% rename from test/integration/federation/framework/BUILD rename to federation/test/integration/framework/BUILD diff --git a/test/integration/federation/framework/api.go b/federation/test/integration/framework/api.go similarity index 100% rename from test/integration/federation/framework/api.go rename to federation/test/integration/framework/api.go diff --git a/test/integration/federation/framework/controller.go b/federation/test/integration/framework/controller.go similarity index 100% rename from test/integration/federation/framework/controller.go rename to federation/test/integration/framework/controller.go diff --git a/test/integration/federation/framework/crudtester.go b/federation/test/integration/framework/crudtester.go similarity index 100% rename from test/integration/federation/framework/crudtester.go rename to federation/test/integration/framework/crudtester.go diff --git a/test/integration/federation/framework/federation.go b/federation/test/integration/framework/federation.go similarity index 100% rename from test/integration/federation/framework/federation.go rename to federation/test/integration/framework/federation.go diff --git a/test/integration/federation/framework/util.go b/federation/test/integration/framework/util.go similarity index 100% rename from test/integration/federation/framework/util.go rename to federation/test/integration/framework/util.go diff --git a/test/integration/federation/main_test.go b/federation/test/integration/main_test.go similarity index 97% rename from test/integration/federation/main_test.go rename to federation/test/integration/main_test.go index ccce686e76..0a64b7565e 100644 --- a/test/integration/federation/main_test.go +++ b/federation/test/integration/main_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package federation +package integration import ( "testing" diff --git a/hack/.golint_failures b/hack/.golint_failures index 7b5ee53c8c..92a6792837 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -62,6 +62,7 @@ federation/registry/cluster/etcd federation/test/e2e federation/test/e2e/framework federation/test/e2e/upgrades +federation/test/integration/framework pkg/api/endpoints pkg/api/helper pkg/api/helper/qos @@ -812,7 +813,6 @@ test/images/resource-consumer/controller test/integration test/integration/auth test/integration/evictions -test/integration/federation/framework test/integration/framework test/integration/master test/integration/replicaset diff --git a/hack/make-rules/test-integration.sh b/hack/make-rules/test-integration.sh index c180f45e89..53804c37f1 100755 --- a/hack/make-rules/test-integration.sh +++ b/hack/make-rules/test-integration.sh @@ -49,6 +49,9 @@ kube::test::find_integration_test_dirs() { find vendor/k8s.io/apiextensions-apiserver/test/integration/ -name '*_test.go' -print0 \ | xargs -0n1 dirname | sed "s|^|${KUBE_GO_PACKAGE}/|" \ | LC_ALL=C sort -u + find federation/test/integration/ -name '*_test.go' -print0 \ + | xargs -0n1 dirname | sed "s|^|${KUBE_GO_PACKAGE}/|" \ + | LC_ALL=C sort -u ) } diff --git a/hack/make-rules/test.sh b/hack/make-rules/test.sh index f7f0d812f7..6caed8b117 100755 --- a/hack/make-rules/test.sh +++ b/hack/make-rules/test.sh @@ -61,6 +61,7 @@ kube::test::find_dirs() { -o -path './third_party/*' \ -o -path './staging/*' \ -o -path './vendor/*' \ + -o -path './federation/test/*' \ \) -prune \ \) -name '*_test.go' -print0 | xargs -0n1 dirname | sed "s|^\./|${KUBE_GO_PACKAGE}/|" | LC_ALL=C sort -u