From 4fdb701e3cc6e4907baeec0397fbbff465e42ede Mon Sep 17 00:00:00 2001 From: Klaus Ma Date: Sat, 5 Aug 2017 07:34:28 +0800 Subject: [PATCH] Moved node/testutil to upper dir. --- hack/.golint_failures | 1 - pkg/controller/BUILD | 3 ++- pkg/controller/cloud/BUILD | 2 +- pkg/controller/cloud/node_controller_test.go | 2 +- pkg/controller/controller_utils_test.go | 2 +- pkg/controller/node/BUILD | 7 ++---- pkg/controller/node/cidr_allocator_test.go | 2 +- pkg/controller/node/nodecontroller_test.go | 2 +- pkg/controller/node/taint_controller_test.go | 2 +- pkg/controller/podgc/BUILD | 2 +- pkg/controller/podgc/gc_controller_test.go | 2 +- pkg/controller/{node => }/testutil/BUILD | 0 .../{node => }/testutil/test_utils.go | 22 +++++++++---------- 13 files changed, 23 insertions(+), 26 deletions(-) rename pkg/controller/{node => }/testutil/BUILD (100%) rename pkg/controller/{node => }/testutil/test_utils.go (95%) diff --git a/hack/.golint_failures b/hack/.golint_failures index 136282523b0..57d2bc2b388 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -182,7 +182,6 @@ pkg/controller/job pkg/controller/namespace pkg/controller/namespace/deletion pkg/controller/node -pkg/controller/node/testutil pkg/controller/podautoscaler pkg/controller/podautoscaler/metrics pkg/controller/podgc diff --git a/pkg/controller/BUILD b/pkg/controller/BUILD index dc6dbfbac2b..1cdc7f61fc8 100644 --- a/pkg/controller/BUILD +++ b/pkg/controller/BUILD @@ -20,7 +20,7 @@ go_test( "//pkg/api:go_default_library", "//pkg/api/install:go_default_library", "//pkg/api/testapi:go_default_library", - "//pkg/controller/node/testutil:go_default_library", + "//pkg/controller/testutil:go_default_library", "//pkg/securitycontext:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/api/extensions/v1beta1:go_default_library", @@ -128,6 +128,7 @@ filegroup( "//pkg/controller/service:all-srcs", "//pkg/controller/serviceaccount:all-srcs", "//pkg/controller/statefulset:all-srcs", + "//pkg/controller/testutil:all-srcs", "//pkg/controller/ttl:all-srcs", "//pkg/controller/volume/attachdetach:all-srcs", "//pkg/controller/volume/events:all-srcs", diff --git a/pkg/controller/cloud/BUILD b/pkg/controller/cloud/BUILD index dd5392b721b..d6f3e7d40f3 100644 --- a/pkg/controller/cloud/BUILD +++ b/pkg/controller/cloud/BUILD @@ -43,7 +43,7 @@ go_test( "//pkg/cloudprovider:go_default_library", "//pkg/cloudprovider/providers/fake:go_default_library", "//pkg/controller:go_default_library", - "//pkg/controller/node/testutil:go_default_library", + "//pkg/controller/testutil:go_default_library", "//pkg/kubelet/apis:go_default_library", "//plugin/pkg/scheduler/algorithm:go_default_library", "//vendor/github.com/golang/glog:go_default_library", diff --git a/pkg/controller/cloud/node_controller_test.go b/pkg/controller/cloud/node_controller_test.go index 333081af2f6..033dbe90889 100644 --- a/pkg/controller/cloud/node_controller_test.go +++ b/pkg/controller/cloud/node_controller_test.go @@ -34,7 +34,7 @@ import ( "k8s.io/kubernetes/pkg/cloudprovider" fakecloud "k8s.io/kubernetes/pkg/cloudprovider/providers/fake" "k8s.io/kubernetes/pkg/controller" - "k8s.io/kubernetes/pkg/controller/node/testutil" + "k8s.io/kubernetes/pkg/controller/testutil" kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis" "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" ) diff --git a/pkg/controller/controller_utils_test.go b/pkg/controller/controller_utils_test.go index 7abc0af277e..bd82e48e703 100644 --- a/pkg/controller/controller_utils_test.go +++ b/pkg/controller/controller_utils_test.go @@ -45,7 +45,7 @@ import ( "k8s.io/kubernetes/pkg/api" _ "k8s.io/kubernetes/pkg/api/install" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/controller/node/testutil" + "k8s.io/kubernetes/pkg/controller/testutil" "k8s.io/kubernetes/pkg/securitycontext" ) diff --git a/pkg/controller/node/BUILD b/pkg/controller/node/BUILD index a48ebc072c7..d580fdf4cd1 100644 --- a/pkg/controller/node/BUILD +++ b/pkg/controller/node/BUILD @@ -24,7 +24,7 @@ go_test( "//pkg/cloudprovider:go_default_library", "//pkg/cloudprovider/providers/fake:go_default_library", "//pkg/controller:go_default_library", - "//pkg/controller/node/testutil:go_default_library", + "//pkg/controller/testutil:go_default_library", "//pkg/kubelet/apis:go_default_library", "//pkg/util/node:go_default_library", "//pkg/util/taints:go_default_library", @@ -115,9 +115,6 @@ filegroup( filegroup( name = "all-srcs", - srcs = [ - ":package-srcs", - "//pkg/controller/node/testutil:all-srcs", - ], + srcs = [":package-srcs"], tags = ["automanaged"], ) diff --git a/pkg/controller/node/cidr_allocator_test.go b/pkg/controller/node/cidr_allocator_test.go index 3fc5d4d8ef9..7d2ffb69d1d 100644 --- a/pkg/controller/node/cidr_allocator_test.go +++ b/pkg/controller/node/cidr_allocator_test.go @@ -25,7 +25,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/kubernetes/fake" - "k8s.io/kubernetes/pkg/controller/node/testutil" + "k8s.io/kubernetes/pkg/controller/testutil" ) const ( diff --git a/pkg/controller/node/nodecontroller_test.go b/pkg/controller/node/nodecontroller_test.go index 34d78faaed1..e3782631786 100644 --- a/pkg/controller/node/nodecontroller_test.go +++ b/pkg/controller/node/nodecontroller_test.go @@ -39,7 +39,7 @@ import ( "k8s.io/kubernetes/pkg/cloudprovider" fakecloud "k8s.io/kubernetes/pkg/cloudprovider/providers/fake" "k8s.io/kubernetes/pkg/controller" - "k8s.io/kubernetes/pkg/controller/node/testutil" + "k8s.io/kubernetes/pkg/controller/testutil" kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis" "k8s.io/kubernetes/pkg/util/node" taintutils "k8s.io/kubernetes/pkg/util/taints" diff --git a/pkg/controller/node/taint_controller_test.go b/pkg/controller/node/taint_controller_test.go index f6da5ddd5d1..6ce5eee4705 100644 --- a/pkg/controller/node/taint_controller_test.go +++ b/pkg/controller/node/taint_controller_test.go @@ -24,7 +24,7 @@ import ( "k8s.io/api/core/v1" "k8s.io/client-go/kubernetes/fake" - "k8s.io/kubernetes/pkg/controller/node/testutil" + "k8s.io/kubernetes/pkg/controller/testutil" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clienttesting "k8s.io/client-go/testing" diff --git a/pkg/controller/podgc/BUILD b/pkg/controller/podgc/BUILD index 315bab74cd0..b288636778c 100644 --- a/pkg/controller/podgc/BUILD +++ b/pkg/controller/podgc/BUILD @@ -39,7 +39,7 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/controller:go_default_library", - "//pkg/controller/node/testutil:go_default_library", + "//pkg/controller/testutil:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", diff --git a/pkg/controller/podgc/gc_controller_test.go b/pkg/controller/podgc/gc_controller_test.go index 8ffce2aae47..73ecd7a8ccf 100644 --- a/pkg/controller/podgc/gc_controller_test.go +++ b/pkg/controller/podgc/gc_controller_test.go @@ -30,7 +30,7 @@ import ( clientset "k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes/fake" "k8s.io/kubernetes/pkg/controller" - "k8s.io/kubernetes/pkg/controller/node/testutil" + "k8s.io/kubernetes/pkg/controller/testutil" ) type FakeController struct{} diff --git a/pkg/controller/node/testutil/BUILD b/pkg/controller/testutil/BUILD similarity index 100% rename from pkg/controller/node/testutil/BUILD rename to pkg/controller/testutil/BUILD diff --git a/pkg/controller/node/testutil/test_utils.go b/pkg/controller/testutil/test_utils.go similarity index 95% rename from pkg/controller/node/testutil/test_utils.go rename to pkg/controller/testutil/test_utils.go index 3309e05cf38..3801c4a93d6 100644 --- a/pkg/controller/node/testutil/test_utils.go +++ b/pkg/controller/testutil/test_utils.go @@ -68,30 +68,31 @@ type FakeNodeHandler struct { DeleteWaitChan chan struct{} } +// FakeLegacyHandler is a fake implemtation of CoreV1Interface. type FakeLegacyHandler struct { v1core.CoreV1Interface n *FakeNodeHandler } // GetUpdatedNodesCopy returns a slice of Nodes with updates applied. -func (c *FakeNodeHandler) GetUpdatedNodesCopy() []*v1.Node { - c.lock.Lock() - defer c.lock.Unlock() - updatedNodesCopy := make([]*v1.Node, len(c.UpdatedNodes), len(c.UpdatedNodes)) - for i, ptr := range c.UpdatedNodes { +func (m *FakeNodeHandler) GetUpdatedNodesCopy() []*v1.Node { + m.lock.Lock() + defer m.lock.Unlock() + updatedNodesCopy := make([]*v1.Node, len(m.UpdatedNodes), len(m.UpdatedNodes)) + for i, ptr := range m.UpdatedNodes { updatedNodesCopy[i] = ptr } return updatedNodesCopy } // Core returns fake CoreInterface. -func (c *FakeNodeHandler) Core() v1core.CoreV1Interface { - return &FakeLegacyHandler{c.Clientset.Core(), c} +func (m *FakeNodeHandler) Core() v1core.CoreV1Interface { + return &FakeLegacyHandler{m.Clientset.Core(), m} } // CoreV1 returns fake CoreV1Interface -func (c *FakeNodeHandler) CoreV1() v1core.CoreV1Interface { - return &FakeLegacyHandler{c.Clientset.CoreV1(), c} +func (m *FakeNodeHandler) CoreV1() v1core.CoreV1Interface { + return &FakeLegacyHandler{m.Clientset.CoreV1(), m} } // Nodes return fake NodeInterfaces. @@ -115,9 +116,8 @@ func (m *FakeNodeHandler) Create(node *v1.Node) (*v1.Node, error) { nodeCopy := *node m.CreatedNodes = append(m.CreatedNodes, &nodeCopy) return node, nil - } else { - return nil, errors.New("Create error.") } + return nil, errors.New("create error") } // Get returns a Node from the fake store.