Rename test utils function

eksctl-io · Apr 21, 2020 · 36105a3 · 36105a3
1 parent 1c6a988
commit 36105a3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/pkg/ctl/scale/nodegroup_test.go b/pkg/ctl/scale/nodegroup_test.go
@@ -67,49 +67,49 @@ var _ = Describe("scale", func() {
 		})
 
 		It("missing required flag --cluster", func() {
-			cmd := newMockDefaultCmd("nodegroup")
+			cmd := newDefaultCmd("nodegroup")
 			_, err := cmd.execute()
 			Expect(err).To(HaveOccurred())
 			Expect(err.Error()).To(Equal("--cluster must be set"))
 		})
 
 		It("setting --name and argument at the same time", func() {
-			cmd := newMockDefaultCmd("nodegroup", "ng", "--cluster", "dummy", "--name", "ng")
+			cmd := newDefaultCmd("nodegroup", "ng", "--cluster", "dummy", "--name", "ng")
 			_, err := cmd.execute()
 			Expect(err).To(HaveOccurred())
 			Expect(err.Error()).To(Equal("--name=ng and argument ng cannot be used at the same time"))
 		})
 
 		It("missing required nodes flag --nodes", func() {
-			cmd := newMockDefaultCmd("nodegroup", "ng", "--cluster", "dummy")
+			cmd := newDefaultCmd("nodegroup", "ng", "--cluster", "dummy")
 			_, err := cmd.execute()
 			Expect(err).To(HaveOccurred())
 			Expect(err.Error()).To(Equal("number of nodes must be 0 or greater. Use the --nodes/-N flag"))
 		})
 
 		It("invalid flag", func() {
-			cmd := newMockDefaultCmd("nodegroup", "--invalid", "dummy")
+			cmd := newDefaultCmd("nodegroup", "--invalid", "dummy")
 			_, err := cmd.execute()
 			Expect(err).To(HaveOccurred())
 			Expect(err.Error()).To(Equal("unknown flag: --invalid"))
 		})
 
 		It("desired node less than min nodes", func() {
-			cmd := newMockDefaultCmd("nodegroup", "ng", "--cluster", "dummy", "--nodes", "2", "--nodes-min", "3")
+			cmd := newDefaultCmd("nodegroup", "ng", "--cluster", "dummy", "--nodes", "2", "--nodes-min", "3")
 			_, err := cmd.execute()
 			Expect(err).To(HaveOccurred())
 			Expect(err.Error()).To(Equal("minimum number of nodes must be less than or equal to number of nodes"))
 		})
 
 		It("desired node greater than max nodes", func() {
-			cmd := newMockDefaultCmd("nodegroup", "ng", "--cluster", "dummy", "--nodes", "2", "--nodes-max", "1")
+			cmd := newDefaultCmd("nodegroup", "ng", "--cluster", "dummy", "--nodes", "2", "--nodes-max", "1")
 			_, err := cmd.execute()
 			Expect(err).To(HaveOccurred())
 			Expect(err.Error()).To(Equal("maximum number of nodes must be greater than or equal to number of nodes"))
 		})
 
 		It("desired node outside the range [min, max]", func() {
-			cmd := newMockDefaultCmd("nodegroup", "ng", "--cluster", "dummy", "--nodes", "2", "--nodes-min", "1", "--nodes-max", "1")
+			cmd := newDefaultCmd("nodegroup", "ng", "--cluster", "dummy", "--nodes", "2", "--nodes-min", "1", "--nodes-max", "1")
 			_, err := cmd.execute()
 			Expect(err).To(HaveOccurred())
 			Expect(err.Error()).To(Equal("number of nodes must be within range of min nodes and max nodes"))

diff --git a/pkg/ctl/scale/scale_test.go b/pkg/ctl/scale/scale_test.go
@@ -11,21 +11,21 @@ import (
 var _ = Describe("generate", func() {
 	Describe("invalid-resource", func() {
 		It("with no flag", func() {
-			cmd := newMockDefaultCmd("invalid-resource")
+			cmd := newDefaultCmd("invalid-resource")
 			out, err := cmd.execute()
 			Expect(err).To(HaveOccurred())
 			Expect(err.Error()).To(Equal("unknown command \"invalid-resource\" for \"scale\""))
 			Expect(out).To(ContainSubstring("usage"))
 		})
 		It("with invalid-resource and some flag", func() {
-			cmd := newMockDefaultCmd("invalid-resource", "--invalid-flag", "foo")
+			cmd := newDefaultCmd("invalid-resource", "--invalid-flag", "foo")
 			out, err := cmd.execute()
 			Expect(err).To(HaveOccurred())
 			Expect(err.Error()).To(Equal("unknown command \"invalid-resource\" for \"scale\""))
 			Expect(out).To(ContainSubstring("usage"))
 		})
 		It("with invalid-resource and additional argument", func() {
-			cmd := newMockDefaultCmd("invalid-resource", "foo")
+			cmd := newDefaultCmd("invalid-resource", "foo")
 			out, err := cmd.execute()
 			Expect(err).To(HaveOccurred())
 			Expect(err.Error()).To(Equal("unknown command \"invalid-resource\" for \"scale\""))
@@ -34,7 +34,7 @@ var _ = Describe("generate", func() {
 	})
 })
 
-func newMockDefaultCmd(args ...string) *mockVerbCmd {
+func newDefaultCmd(args ...string) *mockVerbCmd {
 	flagGrouping := cmdutils.NewGrouping()
 	cmd := Command(flagGrouping)
 	cmd.SetArgs(args)