Skip to content

Commit f6feef8

Browse files
committed
image/test: Fix go test args being used by CLI commands
By default cobra inherit the `os.Args` if there's no non-nil Args slice set. Signed-off-by: Paweł Gronowski <[email protected]>
1 parent 631f32e commit f6feef8

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

cli/command/image/list_test.go

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func TestNewImagesCommandErrors(t *testing.T) {
3838
cmd := newImagesCommand(test.NewFakeCli(&fakeClient{imageListFunc: tc.imageListFunc}))
3939
cmd.SetOut(io.Discard)
4040
cmd.SetErr(io.Discard)
41-
cmd.SetArgs(tc.args)
41+
cmd.SetArgs(nilToEmptySlice(tc.args))
4242
assert.ErrorContains(t, cmd.Execute(), tc.expectedError)
4343
})
4444
}
@@ -87,7 +87,7 @@ func TestNewImagesCommandSuccess(t *testing.T) {
8787
cmd := newImagesCommand(cli)
8888
cmd.SetOut(io.Discard)
8989
cmd.SetErr(io.Discard)
90-
cmd.SetArgs(tc.args)
90+
cmd.SetArgs(nilToEmptySlice(tc.args))
9191
err := cmd.Execute()
9292
assert.NilError(t, err)
9393
golden.Assert(t, cli.OutBuffer().String(), fmt.Sprintf("list-command-success.%s.golden", tc.name))
@@ -97,6 +97,7 @@ func TestNewImagesCommandSuccess(t *testing.T) {
9797

9898
func TestNewListCommandAlias(t *testing.T) {
9999
cmd := newListCommand(test.NewFakeCli(&fakeClient{}))
100+
cmd.SetArgs([]string{""})
100101
assert.Check(t, cmd.HasAlias("list"))
101102
assert.Check(t, !cmd.HasAlias("other"))
102103
}
@@ -114,3 +115,10 @@ func TestNewListCommandAmbiguous(t *testing.T) {
114115
assert.NilError(t, err)
115116
golden.Assert(t, cli.ErrBuffer().String(), "list-command-ambiguous.golden")
116117
}
118+
119+
func nilToEmptySlice[T any](s []T) []T {
120+
if s == nil {
121+
return []T{}
122+
}
123+
return s
124+
}

cli/command/image/remove_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ func (notFound) NotFound() {}
2626

2727
func TestNewRemoveCommandAlias(t *testing.T) {
2828
cmd := newImageRemoveCommand(test.NewFakeCli(&fakeClient{}))
29+
cmd.SetArgs([]string{""})
2930
assert.Check(t, cmd.HasAlias("rmi"))
3031
assert.Check(t, cmd.HasAlias("remove"))
3132
assert.Check(t, !cmd.HasAlias("other"))
@@ -69,7 +70,7 @@ func TestNewRemoveCommandErrors(t *testing.T) {
6970
}))
7071
cmd.SetOut(io.Discard)
7172
cmd.SetErr(io.Discard)
72-
cmd.SetArgs(tc.args)
73+
cmd.SetArgs(nilToEmptySlice(tc.args))
7374
assert.ErrorContains(t, cmd.Execute(), tc.expectedError)
7475
})
7576
}
@@ -134,7 +135,7 @@ func TestNewRemoveCommandSuccess(t *testing.T) {
134135
cmd := newRemoveCommand(cli)
135136
cmd.SetOut(io.Discard)
136137
cmd.SetErr(io.Discard)
137-
cmd.SetArgs(tc.args)
138+
cmd.SetArgs(nilToEmptySlice(tc.args))
138139
assert.NilError(t, cmd.Execute())
139140
assert.Check(t, is.Equal(tc.expectedStderr, cli.ErrBuffer().String()))
140141
golden.Assert(t, cli.OutBuffer().String(), fmt.Sprintf("remove-command-success.%s.golden", tc.name))

0 commit comments

Comments
 (0)