tests: reset every command flag in execute(), not inside individual testsUnverified
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01FgkcT3UPxwxukBKojB5eg4
93ced54 parent: 8aaf8d0 modified
cmd/release_smoke_test.go +0 -7 | @@ -121,7 +121,6 @@ func TestPRCreateSendsDraftExplicitly(t *testing.T) { | ||
| 121 | 121 | t.Errorf("unexpected output for a ready MR:\n%s", out) |
| 122 | 122 | } |
| 123 | 123 | |
| 124 | - prDraft = false | |
| 125 | 124 | out, _, err = execute(t, "pr", "create", "-R", "rick/portal", "--base", "main", "--head", "f", "--title", "T", "--draft") |
| 126 | 125 | if err != nil { |
| 127 | 126 | t.Fatalf("pr create --draft: %v", err) |
| @@ -132,9 +131,7 @@ func TestPRCreateSendsDraftExplicitly(t *testing.T) { | ||
| 132 | 131 | if !strings.Contains(out, "draft merge request #2") || !strings.Contains(out, "pr ready 2") { |
| 133 | 132 | t.Errorf("draft output should say so and point at pr ready:\n%s", out) |
| 134 | 133 | } |
| 135 | - prDraft = false | |
| 136 | 134 | |
| 137 | - prReadyUndo = false | |
| 138 | 135 | out, _, err = execute(t, "pr", "ready", "7", "-R", "rick/portal") |
| 139 | 136 | if err != nil { |
| 140 | 137 | t.Fatalf("pr ready: %v", err) |
| @@ -149,7 +146,6 @@ func TestPRCreateSendsDraftExplicitly(t *testing.T) { | ||
| 149 | 146 | if !strings.Contains(out, "#7 is a draft again") { |
| 150 | 147 | t.Errorf("pr ready --undo output:\n%s", out) |
| 151 | 148 | } |
| 152 | - prReadyUndo = false | |
| 153 | 149 | } |
| 154 | 150 | |
| 155 | 151 | func TestPRListShowsDraft(t *testing.T) { |
| @@ -205,7 +201,6 @@ func TestLabelCommands(t *testing.T) { | ||
| 205 | 201 | t.Setenv("RICKUB_HOST", srv.URL) |
| 206 | 202 | t.Setenv("RICKUB_TOKEN", "rickub_pat_test") |
| 207 | 203 | |
| 208 | - labelColor, labelNewName = "", "" | |
| 209 | 204 | out, _, err := execute(t, "label", "create", "docs", "-R", "rick/portal", "--color", "#0075ca") |
| 210 | 205 | if err != nil { |
| 211 | 206 | t.Fatalf("label create: %v", err) |
| @@ -217,7 +212,6 @@ func TestLabelCommands(t *testing.T) { | ||
| 217 | 212 | t.Errorf("create output:\n%s", out) |
| 218 | 213 | } |
| 219 | 214 | |
| 220 | - labelColor, labelNewName = "", "" | |
| 221 | 215 | if _, _, err := execute(t, "label", "edit", "bug", "-R", "rick/portal", "--name", "defect", "--color", "ffffff"); err != nil { |
| 222 | 216 | t.Fatalf("label edit (case-insensitive lookup): %v", err) |
| 223 | 217 | } |
| @@ -225,7 +219,6 @@ func TestLabelCommands(t *testing.T) { | ||
| 225 | 219 | t.Errorf("patch body = %v", patched) |
| 226 | 220 | } |
| 227 | 221 | |
| 228 | - labelColor, labelNewName = "", "" | |
| 229 | 222 | if _, _, err := execute(t, "label", "edit", "bug", "-R", "rick/portal"); err == nil { |
| 230 | 223 | t.Error("edit with nothing to change should fail") |
| 231 | 224 | } |
| @@ -121,7 +121,6 @@ func TestPRCreateSendsDraftExplicitly(t *testing.T) { | |||
| 121 | t.Errorf("unexpected output for a ready MR:\n%s", out) | 121 | t.Errorf("unexpected output for a ready MR:\n%s", out) |
| 122 | } | 122 | } |
| 123 | 123 | ||
| 124 | - prDraft = false | ||
| 125 | out, _, err = execute(t, "pr", "create", "-R", "rick/portal", "--base", "main", "--head", "f", "--title", "T", "--draft") | 124 | out, _, err = execute(t, "pr", "create", "-R", "rick/portal", "--base", "main", "--head", "f", "--title", "T", "--draft") |
| 126 | if err != nil { | 125 | if err != nil { |
| 127 | t.Fatalf("pr create --draft: %v", err) | 126 | t.Fatalf("pr create --draft: %v", err) |
| @@ -132,9 +131,7 @@ func TestPRCreateSendsDraftExplicitly(t *testing.T) { | |||
| 132 | if !strings.Contains(out, "draft merge request #2") || !strings.Contains(out, "pr ready 2") { | 131 | if !strings.Contains(out, "draft merge request #2") || !strings.Contains(out, "pr ready 2") { |
| 133 | t.Errorf("draft output should say so and point at pr ready:\n%s", out) | 132 | t.Errorf("draft output should say so and point at pr ready:\n%s", out) |
| 134 | } | 133 | } |
| 135 | - prDraft = false | ||
| 136 | 134 | ||
| 137 | - prReadyUndo = false | ||
| 138 | out, _, err = execute(t, "pr", "ready", "7", "-R", "rick/portal") | 135 | out, _, err = execute(t, "pr", "ready", "7", "-R", "rick/portal") |
| 139 | if err != nil { | 136 | if err != nil { |
| 140 | t.Fatalf("pr ready: %v", err) | 137 | t.Fatalf("pr ready: %v", err) |
| @@ -149,7 +146,6 @@ func TestPRCreateSendsDraftExplicitly(t *testing.T) { | |||
| 149 | if !strings.Contains(out, "#7 is a draft again") { | 146 | if !strings.Contains(out, "#7 is a draft again") { |
| 150 | t.Errorf("pr ready --undo output:\n%s", out) | 147 | t.Errorf("pr ready --undo output:\n%s", out) |
| 151 | } | 148 | } |
| 152 | - prReadyUndo = false | ||
| 153 | } | 149 | } |
| 154 | 150 | ||
| 155 | func TestPRListShowsDraft(t *testing.T) { | 151 | func TestPRListShowsDraft(t *testing.T) { |
| @@ -205,7 +201,6 @@ func TestLabelCommands(t *testing.T) { | |||
| 205 | t.Setenv("RICKUB_HOST", srv.URL) | 201 | t.Setenv("RICKUB_HOST", srv.URL) |
| 206 | t.Setenv("RICKUB_TOKEN", "rickub_pat_test") | 202 | t.Setenv("RICKUB_TOKEN", "rickub_pat_test") |
| 207 | 203 | ||
| 208 | - labelColor, labelNewName = "", "" | ||
| 209 | out, _, err := execute(t, "label", "create", "docs", "-R", "rick/portal", "--color", "#0075ca") | 204 | out, _, err := execute(t, "label", "create", "docs", "-R", "rick/portal", "--color", "#0075ca") |
| 210 | if err != nil { | 205 | if err != nil { |
| 211 | t.Fatalf("label create: %v", err) | 206 | t.Fatalf("label create: %v", err) |
| @@ -217,7 +212,6 @@ func TestLabelCommands(t *testing.T) { | |||
| 217 | t.Errorf("create output:\n%s", out) | 212 | t.Errorf("create output:\n%s", out) |
| 218 | } | 213 | } |
| 219 | 214 | ||
| 220 | - labelColor, labelNewName = "", "" | ||
| 221 | if _, _, err := execute(t, "label", "edit", "bug", "-R", "rick/portal", "--name", "defect", "--color", "ffffff"); err != nil { | 215 | if _, _, err := execute(t, "label", "edit", "bug", "-R", "rick/portal", "--name", "defect", "--color", "ffffff"); err != nil { |
| 222 | t.Fatalf("label edit (case-insensitive lookup): %v", err) | 216 | t.Fatalf("label edit (case-insensitive lookup): %v", err) |
| 223 | } | 217 | } |
| @@ -225,7 +219,6 @@ func TestLabelCommands(t *testing.T) { | |||
| 225 | t.Errorf("patch body = %v", patched) | 219 | t.Errorf("patch body = %v", patched) |
| 226 | } | 220 | } |
| 227 | 221 | ||
| 228 | - labelColor, labelNewName = "", "" | ||
| 229 | if _, _, err := execute(t, "label", "edit", "bug", "-R", "rick/portal"); err == nil { | 222 | if _, _, err := execute(t, "label", "edit", "bug", "-R", "rick/portal"); err == nil { |
| 230 | t.Error("edit with nothing to change should fail") | 223 | t.Error("edit with nothing to change should fail") |
| 231 | } | 224 | } |
modified
cmd/repo_test.go +5 -0 | @@ -47,6 +47,11 @@ func execute(t *testing.T, args ...string) (string, string, error) { | ||
| 47 | 47 | prCommit = "" |
| 48 | 48 | prReplyTo = "" |
| 49 | 49 | prReopen = false |
| 50 | + prDraft = false | |
| 51 | + prReadyUndo = false | |
| 52 | + labelRepo = "" | |
| 53 | + labelColor = "" | |
| 54 | + labelNewName = "" | |
| 50 | 55 | |
| 51 | 56 | var out, errBuf bytes.Buffer |
| 52 | 57 | rootCmd.SetOut(&out) |
| @@ -47,6 +47,11 @@ func execute(t *testing.T, args ...string) (string, string, error) { | |||
| 47 | prCommit = "" | 47 | prCommit = "" |
| 48 | prReplyTo = "" | 48 | prReplyTo = "" |
| 49 | prReopen = false | 49 | prReopen = false |
| 50 | + prDraft = false | ||
| 51 | + prReadyUndo = false | ||
| 52 | + labelRepo = "" | ||
| 53 | + labelColor = "" | ||
| 54 | + labelNewName = "" | ||
| 50 | 55 | ||
| 51 | var out, errBuf bytes.Buffer | 56 | var out, errBuf bytes.Buffer |
| 52 | rootCmd.SetOut(&out) | 57 | rootCmd.SetOut(&out) |