Skip to content

Commit 88182ea

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 062ef96 commit 88182ea

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
@@ -39,7 +39,7 @@ func TestNewImagesCommandErrors(t *testing.T) {
3939
cmd := newImagesCommand(test.NewFakeCli(&fakeClient{imageListFunc: tc.imageListFunc}))
4040
cmd.SetOut(io.Discard)
4141
cmd.SetErr(io.Discard)
42-
cmd.SetArgs(tc.args)
42+
cmd.SetArgs(nilToEmptySlice(tc.args))
4343
assert.ErrorContains(t, cmd.Execute(), tc.expectedError)
4444
})
4545
}
@@ -88,7 +88,7 @@ func TestNewImagesCommandSuccess(t *testing.T) {
8888
cmd := newImagesCommand(cli)
8989
cmd.SetOut(io.Discard)
9090
cmd.SetErr(io.Discard)
91-
cmd.SetArgs(tc.args)
91+
cmd.SetArgs(nilToEmptySlice(tc.args))
9292
err := cmd.Execute()
9393
assert.NilError(t, err)
9494
golden.Assert(t, cli.OutBuffer().String(), fmt.Sprintf("list-command-success.%s.golden", tc.name))
@@ -98,6 +98,7 @@ func TestNewImagesCommandSuccess(t *testing.T) {
9898

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

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
}
@@ -126,7 +127,7 @@ func TestNewRemoveCommandSuccess(t *testing.T) {
126127
cmd := newRemoveCommand(cli)
127128
cmd.SetOut(io.Discard)
128129
cmd.SetErr(io.Discard)
129-
cmd.SetArgs(tc.args)
130+
cmd.SetArgs(nilToEmptySlice(tc.args))
130131
assert.NilError(t, cmd.Execute())
131132
assert.Check(t, is.Equal(tc.expectedStderr, cli.ErrBuffer().String()))
132133
golden.Assert(t, cli.OutBuffer().String(), fmt.Sprintf("remove-command-success.%s.golden", tc.name))

0 commit comments

Comments
 (0)