e2e: increase test timeout to 20m

TestTagResolution adds ~5m to the suite, pushing past the old 10m limit.

Signed-off-by: Alice Frosi <afrosi@redhat.com>

Author: alicefr

Makefile

@@ -69,7 +69,7 @@ e2e: ## Run e2e tests (requires: make deploy-bink). V=1 for verbose. RUN=<regex>
 		ARTIFACTS=$(ARTIFACTS) \
 		BINK_NODE_IMAGE_DIGEST=$$(skopeo inspect --tls-verify=false --format '{{.Digest}}' docker://localhost:5000/node:latest) \
 		BINK_NODE_IMAGE_UPDATE_DIGEST=$$(skopeo inspect --tls-verify=false docker://localhost:5000/node:update | jq -r '.Digest') \
-		go test -timeout 10m -count=1 $(if $(V),-v) $(if $(RUN),-run $(RUN)) .
+		go test -timeout 20m -count=1 $(if $(V),-v) $(if $(RUN),-run $(RUN)) .
 
 ##@ Build
 

test/e2e/e2eutil/env.go

@@ -398,34 +398,74 @@ const (
 )
 
 // argName returns the flag name from a --key or --key=value argument.
+// Returns "" for bare values that don't start with --.
 func argName(arg string) string {
+	if !strings.HasPrefix(arg, "--") {
+		return ""
+	}
 	arg = strings.TrimPrefix(arg, "--")
 	if i := strings.Index(arg, "="); i >= 0 {
 		return arg[:i]
 	}
 	return arg
 }
 
+type flagGroup struct {
+	name  string
+	elems []string
+}
+
+// parseArgs groups a flat argument list into logical flags.
+// "--key=val" is one group; "--key val" (space-separated) is one group;
+// "--bool-flag" is one group.
+func parseArgs(args []string) []flagGroup {
+	var groups []flagGroup
+	for i := 0; i < len(args); i++ {
+		n := argName(args[i])
+		if n == "" {
+			continue
+		}
+		g := flagGroup{name: n, elems: []string{args[i]}}
+		// --key value: flag without "=" whose next element is a value, not another flag
+		if !strings.Contains(args[i], "=") && i+1 < len(args) && !strings.HasPrefix(args[i+1], "--") {
+			g.elems = append(g.elems, args[i+1])
+			i++
+		}
+		// --key=value or --bool-flag: single-element group (no special handling needed)
+		groups = append(groups, g)
+	}
+	return groups
+}
+
 // mergeArgs merges newArgs into oldArgs. Existing flags whose name
 // matches a new flag are replaced; unmatched new flags are appended.
+// Handles both --key=value and --key value forms.
 func mergeArgs(oldArgs, newArgs []string) []string {
-	newByName := make(map[string]string, len(newArgs))
-	for _, a := range newArgs {
-		newByName[argName(a)] = a
+	newGroups := parseArgs(newArgs)
+	newByName := make(map[string]flagGroup, len(newGroups))
+	for _, g := range newGroups {
+		if g.name != "" {
+			newByName[g.name] = g
+		}
 	}
 
+	oldGroups := parseArgs(oldArgs)
 	var result []string
-	for _, a := range oldArgs {
-		if replacement, ok := newByName[argName(a)]; ok {
-			result = append(result, replacement)
-			delete(newByName, argName(a))
-		} else {
-			result = append(result, a)
+	for _, g := range oldGroups {
+		if g.name != "" {
+			if replacement, ok := newByName[g.name]; ok {
+				result = append(result, replacement.elems...)
+				delete(newByName, g.name)
+				continue
+			}
 		}
+		result = append(result, g.elems...)
 	}
-	for _, a := range newArgs {
-		if _, ok := newByName[argName(a)]; ok {
-			result = append(result, a)
+	for _, g := range newGroups {
+		if g.name != "" {
+			if _, ok := newByName[g.name]; ok {
+				result = append(result, g.elems...)
+			}
 		}
 	}
 	return result

test/e2e/e2eutil/env_test.go

@@ -55,6 +55,36 @@ func TestMergeArgs(t *testing.T) {
 			newArgs: []string{"--interval=10s"},
 			want:    []string{"--interval=10s"},
 		},
+		{
+			name:    "space-separated flag replaced",
+			oldArgs: []string{"--interval", "5m", "--foo=bar"},
+			newArgs: []string{"--interval", "10s"},
+			want:    []string{"--interval", "10s", "--foo=bar"},
+		},
+		{
+			name:    "equals form replaces space-separated",
+			oldArgs: []string{"--interval", "5m"},
+			newArgs: []string{"--interval=10s"},
+			want:    []string{"--interval=10s"},
+		},
+		{
+			name:    "space-separated replaces equals form",
+			oldArgs: []string{"--interval=5m"},
+			newArgs: []string{"--interval", "10s"},
+			want:    []string{"--interval", "10s"},
+		},
+		{
+			name:    "space-separated new arg appended",
+			oldArgs: []string{"--foo=bar"},
+			newArgs: []string{"--interval", "10s"},
+			want:    []string{"--foo=bar", "--interval", "10s"},
+		},
+		{
+			name:    "mixed forms multiple flags",
+			oldArgs: []string{"--foo", "bar", "--enable-feature", "--baz=qux"},
+			newArgs: []string{"--foo=newbar", "--baz", "newqux"},
+			want:    []string{"--foo=newbar", "--enable-feature", "--baz", "newqux"},
+		},
 	}
 
 	for _, tt := range tests {