p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

image/test: Fix go test args being used by CLI commands

Browse Source 
By default cobra inherit the `os.Args` if there's no non-nil Args slice
set.

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
This commit is contained in:
Paweł Gronowski
2025-10-15 15:04:47 +02:00
parent 631f32ee9d
commit f6feef8fe2
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cli/command/image/list_test.go
View File

@ -38,7 +38,7 @@ func TestNewImagesCommandErrors(t *testing.T) {
cmd := newImagesCommand(test.NewFakeCli(&fakeClient{imageListFunc: tc.imageListFunc}))
cmd.SetOut(io.Discard)
cmd.SetErr(io.Discard)
cmd.SetArgs(tc.args)
cmd.SetArgs(nilToEmptySlice(tc.args))
assert.ErrorContains(t, cmd.Execute(), tc.expectedError)
})
}
@ -87,7 +87,7 @@ func TestNewImagesCommandSuccess(t *testing.T) {
cmd := newImagesCommand(cli)
cmd.SetOut(io.Discard)
cmd.SetErr(io.Discard)
cmd.SetArgs(tc.args)
cmd.SetArgs(nilToEmptySlice(tc.args))
err := cmd.Execute()
assert.NilError(t, err)
golden.Assert(t, cli.OutBuffer().String(), fmt.Sprintf("list-command-success.%s.golden", tc.name))
@ -97,6 +97,7 @@ func TestNewImagesCommandSuccess(t *testing.T) {
func TestNewListCommandAlias(t *testing.T) {
cmd := newListCommand(test.NewFakeCli(&fakeClient{}))
cmd.SetArgs([]string{""})
assert.Check(t, cmd.HasAlias("list"))
assert.Check(t, !cmd.HasAlias("other"))
}
@ -114,3 +115,10 @@ func TestNewListCommandAmbiguous(t *testing.T) {
assert.NilError(t, err)
golden.Assert(t, cli.ErrBuffer().String(), "list-command-ambiguous.golden")
}
func nilToEmptySlice[T any](s []T) []T {
if s == nil {
return []T{}
}
return s
}

5
cli/command/image/remove_test.go
View File

@ -26,6 +26,7 @@ func (notFound) NotFound() {}
func TestNewRemoveCommandAlias(t *testing.T) {
cmd := newImageRemoveCommand(test.NewFakeCli(&fakeClient{}))
cmd.SetArgs([]string{""})
assert.Check(t, cmd.HasAlias("rmi"))
assert.Check(t, cmd.HasAlias("remove"))
assert.Check(t, !cmd.HasAlias("other"))
@ -69,7 +70,7 @@ func TestNewRemoveCommandErrors(t *testing.T) {
}))
cmd.SetOut(io.Discard)
cmd.SetErr(io.Discard)
cmd.SetArgs(tc.args)
cmd.SetArgs(nilToEmptySlice(tc.args))
assert.ErrorContains(t, cmd.Execute(), tc.expectedError)
})
}
@ -134,7 +135,7 @@ func TestNewRemoveCommandSuccess(t *testing.T) {
cmd := newRemoveCommand(cli)
cmd.SetOut(io.Discard)
cmd.SetErr(io.Discard)
cmd.SetArgs(tc.args)
cmd.SetArgs(nilToEmptySlice(tc.args))
assert.NilError(t, cmd.Execute())
assert.Check(t, is.Equal(tc.expectedStderr, cli.ErrBuffer().String()))
golden.Assert(t, cli.OutBuffer().String(), fmt.Sprintf("remove-command-success.%s.golden", tc.name))