From 32c5d938eb8cdaf1d404210441d6e3ba9cc89904 Mon Sep 17 00:00:00 2001 From: Phillip Wittrock Date: Thu, 17 Aug 2017 11:48:18 -0700 Subject: [PATCH] Update with PR comments --- pkg/kubectl/apps/apps_suite_test.go | 4 ++-- pkg/kubectl/apps/kind_visitor_test.go | 21 ++------------------- pkg/kubectl/cmd/util/factory.go | 2 +- 3 files changed, 5 insertions(+), 22 deletions(-) diff --git a/pkg/kubectl/apps/apps_suite_test.go b/pkg/kubectl/apps/apps_suite_test.go index a2300f1e445..b1bc1310ea0 100644 --- a/pkg/kubectl/apps/apps_suite_test.go +++ b/pkg/kubectl/apps/apps_suite_test.go @@ -17,10 +17,10 @@ limitations under the License. package apps_test import ( + "testing" + . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - - "testing" ) func TestApps(t *testing.T) { diff --git a/pkg/kubectl/apps/kind_visitor_test.go b/pkg/kubectl/apps/kind_visitor_test.go index 7d392b04910..c5c2d1a631c 100644 --- a/pkg/kubectl/apps/kind_visitor_test.go +++ b/pkg/kubectl/apps/kind_visitor_test.go @@ -74,21 +74,13 @@ var _ = Describe("When KindVisitor accepts a GroupKind", func() { It("should Visit Job iff the Kind is a Job", func() { kind := apps.GroupKindElement{ Kind: "Job", - Group: "apps", + Group: "batch", } Expect(kind.Accept(visitor)).ShouldNot(HaveOccurred()) Expect(visitor.visits).To(Equal(map[string]int{ "Job": 1, })) - kind = apps.GroupKindElement{ - Kind: "Job", - Group: "extensions", - } - Expect(kind.Accept(visitor)).ShouldNot(HaveOccurred()) - Expect(visitor.visits).To(Equal(map[string]int{ - "Job": 2, - })) }) It("should Visit Pod iff the Kind is a Pod", func() { @@ -133,21 +125,12 @@ var _ = Describe("When KindVisitor accepts a GroupKind", func() { It("should Visit ReplicaSet iff the Kind is a ReplicaSet", func() { kind := apps.GroupKindElement{ - Kind: "ReplicaSet", - Group: "apps", - } - Expect(kind.Accept(visitor)).ShouldNot(HaveOccurred()) - Expect(visitor.visits).To(Equal(map[string]int{ - "ReplicaSet": 1, - })) - - kind = apps.GroupKindElement{ Kind: "ReplicaSet", Group: "extensions", } Expect(kind.Accept(visitor)).ShouldNot(HaveOccurred()) Expect(visitor.visits).To(Equal(map[string]int{ - "ReplicaSet": 2, + "ReplicaSet": 1, })) }) diff --git a/pkg/kubectl/cmd/util/factory.go b/pkg/kubectl/cmd/util/factory.go index 6ce8f6d7098..40a879bd884 100644 --- a/pkg/kubectl/cmd/util/factory.go +++ b/pkg/kubectl/cmd/util/factory.go @@ -93,7 +93,7 @@ type ClientAccessFactory interface { // ClientSet gives you back an internal, generated clientset ClientSet() (internalclientset.Interface, error) - // KubernetesClientSetForVersion gives you back an external clientset + // KubernetesClientSet gives you back an external clientset KubernetesClientSet() (*kubernetes.Clientset, error) // Returns a RESTClient for accessing Kubernetes resources or an error.