Merge pull request #10994 from rifelpet/kubetest2-equals

kubetest2 - don't overwrite create args that use equals signs
kubernetes · Mar 8, 2021 · 6ce35f9 · 6ce35f9
2 parents fea7589 + 594cdc6
commit 6ce35f9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/tests/e2e/kubetest2-kops/deployer/up.go b/tests/e2e/kubetest2-kops/deployer/up.go
@@ -193,7 +193,8 @@ func (d *deployer) zones() ([]string, error) {
 // This shouldn't be used for arguments that can be specified multiple times like --override
 func appendIfUnset(args []string, arg, value string) []string {
 	for _, existingArg := range args {
-		if existingArg == arg {
+		existingKey := strings.Split(existingArg, "=")
+		if existingKey[0] == arg {
 			return args
 		}
 	}

diff --git a/tests/e2e/kubetest2-kops/deployer/up_test.go b/tests/e2e/kubetest2-kops/deployer/up_test.go
@@ -64,6 +64,13 @@ func TestAppendIfUnset(t *testing.T) {
 			"bar",
 			[]string{"--foo", "bar"},
 		},
+		{
+			"set with same value and equals sign",
+			[]string{"--foo=bar", "--baz=bar"},
+			"--foo",
+			"bar",
+			[]string{"--foo=bar", "--baz=bar"},
+		},
 	}
 
 	for _, tc := range cases {