ab230240ad
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>
66 lines
1.9 KiB
Go
66 lines
1.9 KiB
Go
package manifest
|
|
|
|
import (
|
|
"io"
|
|
"testing"
|
|
|
|
"github.com/docker/cli/cli/manifest/store"
|
|
"github.com/docker/cli/internal/test"
|
|
"gotest.tools/v3/assert"
|
|
)
|
|
|
|
// create two manifest lists and remove them both
|
|
func TestRmSeveralManifests(t *testing.T) {
|
|
manifestStore := store.NewStore(t.TempDir())
|
|
|
|
cli := test.NewFakeCli(nil)
|
|
cli.SetManifestStore(manifestStore)
|
|
|
|
list1 := ref(t, "first:1")
|
|
namedRef := ref(t, "alpine:3.0")
|
|
err := manifestStore.Save(list1, namedRef, fullImageManifest(t, namedRef))
|
|
assert.NilError(t, err)
|
|
namedRef = ref(t, "alpine:3.1")
|
|
err = manifestStore.Save(list1, namedRef, fullImageManifest(t, namedRef))
|
|
assert.NilError(t, err)
|
|
|
|
list2 := ref(t, "second:2")
|
|
namedRef = ref(t, "alpine:3.2")
|
|
err = manifestStore.Save(list2, namedRef, fullImageManifest(t, namedRef))
|
|
assert.NilError(t, err)
|
|
|
|
cmd := newRmManifestListCommand(cli)
|
|
cmd.SetArgs([]string{"example.com/first:1", "example.com/second:2"})
|
|
cmd.SetOut(io.Discard)
|
|
err = cmd.Execute()
|
|
assert.NilError(t, err)
|
|
|
|
_, search1 := cli.ManifestStore().GetList(list1)
|
|
_, search2 := cli.ManifestStore().GetList(list2)
|
|
assert.Error(t, search1, "No such manifest: example.com/first:1")
|
|
assert.Error(t, search2, "No such manifest: example.com/second:2")
|
|
}
|
|
|
|
// attempt to remove a manifest list which was never created
|
|
func TestRmManifestNotCreated(t *testing.T) {
|
|
manifestStore := store.NewStore(t.TempDir())
|
|
|
|
cli := test.NewFakeCli(nil)
|
|
cli.SetManifestStore(manifestStore)
|
|
|
|
list2 := ref(t, "second:2")
|
|
namedRef := ref(t, "alpine:3.2")
|
|
err := manifestStore.Save(list2, namedRef, fullImageManifest(t, namedRef))
|
|
assert.NilError(t, err)
|
|
|
|
cmd := newRmManifestListCommand(cli)
|
|
cmd.SetArgs([]string{"example.com/first:1", "example.com/second:2"})
|
|
cmd.SetOut(io.Discard)
|
|
cmd.SetErr(io.Discard)
|
|
err = cmd.Execute()
|
|
assert.Error(t, err, "No such manifest: example.com/first:1")
|
|
|
|
_, err = cli.ManifestStore().GetList(list2)
|
|
assert.Error(t, err, "No such manifest: example.com/second:2")
|
|
}
|