This makes a quick pass through our tests;
Discard output/err
----------------------------------------------
Many tests were testing for error-conditions, but didn't discard output.
This produced a lot of noise when running the tests, and made it hard
to discover if there were actual failures, or if the output was expected.
For example:
=== RUN TestConfigCreateErrors
Error: "create" requires exactly 2 arguments.
See 'create --help'.
Usage: create [OPTIONS] CONFIG file|- [flags]
Create a config from a file or STDIN
Error: "create" requires exactly 2 arguments.
See 'create --help'.
Usage: create [OPTIONS] CONFIG file|- [flags]
Create a config from a file or STDIN
Error: error creating config
--- PASS: TestConfigCreateErrors (0.00s)
And after discarding output:
=== RUN TestConfigCreateErrors
--- PASS: TestConfigCreateErrors (0.00s)
Use sub-tests where possible
----------------------------------------------
Some tests were already set-up to use test-tables, and even had a usable
name (or in some cases "error" to check for). Change them to actual sub-
tests. Same test as above, but now with sub-tests and output discarded:
=== RUN TestConfigCreateErrors
=== RUN TestConfigCreateErrors/requires_exactly_2_arguments
=== RUN TestConfigCreateErrors/requires_exactly_2_arguments#01
=== RUN TestConfigCreateErrors/error_creating_config
--- PASS: TestConfigCreateErrors (0.00s)
--- PASS: TestConfigCreateErrors/requires_exactly_2_arguments (0.00s)
--- PASS: TestConfigCreateErrors/requires_exactly_2_arguments#01 (0.00s)
--- PASS: TestConfigCreateErrors/error_creating_config (0.00s)
PASS
It's not perfect in all cases (in the above, there's duplicate "expected"
errors, but Go conveniently adds "#01" for the duplicate). There's probably
also various tests I missed that could still use the same changes applied;
we can improve these in follow-ups.
Set cmd.Args to prevent test-failures
----------------------------------------------
When running tests from my IDE, it compiles the tests before running,
then executes the compiled binary to run the tests. Cobra doesn't like
that, because in that situation `os.Args` is taken as argument for the
command that's executed. The command that's tested now sees the test-
flags as arguments (`-test.v -test.run ..`), which causes various tests
to fail ("Command XYZ does not accept arguments").
# compile the tests:
go test -c -o foo.test
# execute the test:
./foo.test -test.v -test.run TestFoo
=== RUN TestFoo
Error: "foo" accepts no arguments.
The Cobra maintainers ran into the same situation, and for their own
use have added a special case to ignore `os.Args` in these cases;
https://github.com/spf13/cobra/blob/v1.8.1/command.go#L1078-L1083
args := c.args
// Workaround FAIL with "go test -v" or "cobra.test -test.v", see #155
if c.args == nil && filepath.Base(os.Args[0]) != "cobra.test" {
args = os.Args[1:]
}
Unfortunately, that exception is too specific (only checks for `cobra.test`),
so doesn't automatically fix the issue for other test-binaries. They did
provide a `cmd.SetArgs()` utility for this purpose
https://github.com/spf13/cobra/blob/v1.8.1/command.go#L276-L280
// SetArgs sets arguments for the command. It is set to os.Args[1:] by default, if desired, can be overridden
// particularly useful when testing.
func (c *Command) SetArgs(a []string) {
c.args = a
}
And the fix is to explicitly set the command's args to an empty slice to
prevent Cobra from falling back to using `os.Args[1:]` as arguments.
cmd := newSomeThingCommand()
cmd.SetArgs([]string{})
Some tests already take this issue into account, and I updated some tests
for this, but there's likely many other ones that can use the same treatment.
Perhaps the Cobra maintainers would accept a contribution to make their
condition less specific and to look for binaries ending with a `.test`
suffix (which is what compiled binaries usually are named as).
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
137 lines
4.0 KiB
Go
137 lines
4.0 KiB
Go
package image
|
|
|
|
import (
|
|
"fmt"
|
|
"io"
|
|
"testing"
|
|
|
|
"github.com/docker/cli/internal/test"
|
|
"github.com/docker/docker/api/types/image"
|
|
"github.com/pkg/errors"
|
|
"gotest.tools/v3/assert"
|
|
is "gotest.tools/v3/assert/cmp"
|
|
"gotest.tools/v3/golden"
|
|
)
|
|
|
|
type notFound struct {
|
|
imageID string
|
|
}
|
|
|
|
func (n notFound) Error() string {
|
|
return "Error: No such image: " + n.imageID
|
|
}
|
|
|
|
func (n notFound) NotFound() {}
|
|
|
|
func TestNewRemoveCommandAlias(t *testing.T) {
|
|
cmd := newRemoveCommand(test.NewFakeCli(&fakeClient{}))
|
|
assert.Check(t, cmd.HasAlias("rmi"))
|
|
assert.Check(t, cmd.HasAlias("remove"))
|
|
assert.Check(t, !cmd.HasAlias("other"))
|
|
}
|
|
|
|
func TestNewRemoveCommandErrors(t *testing.T) {
|
|
testCases := []struct {
|
|
name string
|
|
args []string
|
|
expectedError string
|
|
imageRemoveFunc func(img string, options image.RemoveOptions) ([]image.DeleteResponse, error)
|
|
}{
|
|
{
|
|
name: "wrong args",
|
|
expectedError: "requires at least 1 argument.",
|
|
},
|
|
{
|
|
name: "ImageRemove fail with force option",
|
|
args: []string{"-f", "image1"},
|
|
expectedError: "error removing image",
|
|
imageRemoveFunc: func(img string, options image.RemoveOptions) ([]image.DeleteResponse, error) {
|
|
assert.Check(t, is.Equal("image1", img))
|
|
return []image.DeleteResponse{}, errors.Errorf("error removing image")
|
|
},
|
|
},
|
|
{
|
|
name: "ImageRemove fail",
|
|
args: []string{"arg1"},
|
|
expectedError: "error removing image",
|
|
imageRemoveFunc: func(img string, options image.RemoveOptions) ([]image.DeleteResponse, error) {
|
|
assert.Check(t, !options.Force)
|
|
assert.Check(t, options.PruneChildren)
|
|
return []image.DeleteResponse{}, errors.Errorf("error removing image")
|
|
},
|
|
},
|
|
}
|
|
for _, tc := range testCases {
|
|
tc := tc
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
cmd := NewRemoveCommand(test.NewFakeCli(&fakeClient{
|
|
imageRemoveFunc: tc.imageRemoveFunc,
|
|
}))
|
|
cmd.SetOut(io.Discard)
|
|
cmd.SetErr(io.Discard)
|
|
cmd.SetArgs(tc.args)
|
|
assert.ErrorContains(t, cmd.Execute(), tc.expectedError)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestNewRemoveCommandSuccess(t *testing.T) {
|
|
testCases := []struct {
|
|
name string
|
|
args []string
|
|
imageRemoveFunc func(img string, options image.RemoveOptions) ([]image.DeleteResponse, error)
|
|
expectedStderr string
|
|
}{
|
|
{
|
|
name: "Image Deleted",
|
|
args: []string{"image1"},
|
|
imageRemoveFunc: func(img string, options image.RemoveOptions) ([]image.DeleteResponse, error) {
|
|
assert.Check(t, is.Equal("image1", img))
|
|
return []image.DeleteResponse{{Deleted: img}}, nil
|
|
},
|
|
},
|
|
{
|
|
name: "Image not found with force option",
|
|
args: []string{"-f", "image1"},
|
|
imageRemoveFunc: func(img string, options image.RemoveOptions) ([]image.DeleteResponse, error) {
|
|
assert.Check(t, is.Equal("image1", img))
|
|
assert.Check(t, is.Equal(true, options.Force))
|
|
return []image.DeleteResponse{}, notFound{"image1"}
|
|
},
|
|
expectedStderr: "Error: No such image: image1\n",
|
|
},
|
|
|
|
{
|
|
name: "Image Untagged",
|
|
args: []string{"image1"},
|
|
imageRemoveFunc: func(img string, options image.RemoveOptions) ([]image.DeleteResponse, error) {
|
|
assert.Check(t, is.Equal("image1", img))
|
|
return []image.DeleteResponse{{Untagged: img}}, nil
|
|
},
|
|
},
|
|
{
|
|
name: "Image Deleted and Untagged",
|
|
args: []string{"image1", "image2"},
|
|
imageRemoveFunc: func(img string, options image.RemoveOptions) ([]image.DeleteResponse, error) {
|
|
if img == "image1" {
|
|
return []image.DeleteResponse{{Untagged: img}}, nil
|
|
}
|
|
return []image.DeleteResponse{{Deleted: img}}, nil
|
|
},
|
|
},
|
|
}
|
|
for _, tc := range testCases {
|
|
tc := tc
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
cli := test.NewFakeCli(&fakeClient{imageRemoveFunc: tc.imageRemoveFunc})
|
|
cmd := NewRemoveCommand(cli)
|
|
cmd.SetOut(io.Discard)
|
|
cmd.SetErr(io.Discard)
|
|
cmd.SetArgs(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))
|
|
})
|
|
}
|
|
}
|