c60b360c33
Improve the output for these validation errors:
- Removes the short command description from the output. This information
does not provide much useful help, and distracts from the error message.
- Reduces punctuation, and
- Prefixes the error message with the binary / root-command name
(usually `docker:`) to be consistent with other similar errors.
- Adds an empty line between the error-message and the "call to action"
(`Run 'docker volume --help'...` in the example below). This helps
separating the error message and "usage" from the call-to-action.
Before this patch:
$ docker volume ls one two three
"docker volume ls" accepts no arguments.
See 'docker volume ls --help'.
Usage: docker volume ls [OPTIONS]
List volumes
$ docker volume create one two three
"docker volume create" requires at most 1 argument.
See 'docker volume create --help'.
Usage: docker volume create [OPTIONS] [VOLUME]
Create a volume
With this patch:
$ docker volume ls one two three
docker: 'docker volume ls' accepts no arguments
Usage: docker volume ls [OPTIONS]
Run 'docker volume ls --help' for more information
$ docker voludocker volume create one two three
docker: 'docker volume create' requires at most 1 argument
Usage: docker volume create [OPTIONS] [VOLUME]
SRun 'docker volume create --help' for more information
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
74 lines
2.1 KiB
Go
74 lines
2.1 KiB
Go
package checkpoint
|
|
|
|
import (
|
|
"io"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/docker/cli/internal/test"
|
|
"github.com/docker/docker/api/types/checkpoint"
|
|
"github.com/pkg/errors"
|
|
"gotest.tools/v3/assert"
|
|
is "gotest.tools/v3/assert/cmp"
|
|
)
|
|
|
|
func TestCheckpointCreateErrors(t *testing.T) {
|
|
testCases := []struct {
|
|
args []string
|
|
checkpointCreateFunc func(container string, options checkpoint.CreateOptions) error
|
|
expectedError string
|
|
}{
|
|
{
|
|
args: []string{"too-few-arguments"},
|
|
expectedError: "requires 2 arguments",
|
|
},
|
|
{
|
|
args: []string{"too", "many", "arguments"},
|
|
expectedError: "requires 2 arguments",
|
|
},
|
|
{
|
|
args: []string{"foo", "bar"},
|
|
checkpointCreateFunc: func(container string, options checkpoint.CreateOptions) error {
|
|
return errors.Errorf("error creating checkpoint for container foo")
|
|
},
|
|
expectedError: "error creating checkpoint for container foo",
|
|
},
|
|
}
|
|
|
|
for _, tc := range testCases {
|
|
cli := test.NewFakeCli(&fakeClient{
|
|
checkpointCreateFunc: tc.checkpointCreateFunc,
|
|
})
|
|
cmd := newCreateCommand(cli)
|
|
cmd.SetArgs(tc.args)
|
|
cmd.SetOut(io.Discard)
|
|
cmd.SetErr(io.Discard)
|
|
assert.ErrorContains(t, cmd.Execute(), tc.expectedError)
|
|
}
|
|
}
|
|
|
|
func TestCheckpointCreateWithOptions(t *testing.T) {
|
|
var containerID, checkpointID, checkpointDir string
|
|
var exit bool
|
|
cli := test.NewFakeCli(&fakeClient{
|
|
checkpointCreateFunc: func(container string, options checkpoint.CreateOptions) error {
|
|
containerID = container
|
|
checkpointID = options.CheckpointID
|
|
checkpointDir = options.CheckpointDir
|
|
exit = options.Exit
|
|
return nil
|
|
},
|
|
})
|
|
cmd := newCreateCommand(cli)
|
|
cp := "checkpoint-bar"
|
|
cmd.SetArgs([]string{"container-foo", cp})
|
|
cmd.Flags().Set("leave-running", "true")
|
|
cmd.Flags().Set("checkpoint-dir", "/dir/foo")
|
|
assert.NilError(t, cmd.Execute())
|
|
assert.Check(t, is.Equal("container-foo", containerID))
|
|
assert.Check(t, is.Equal(cp, checkpointID))
|
|
assert.Check(t, is.Equal("/dir/foo", checkpointDir))
|
|
assert.Check(t, is.Equal(false, exit))
|
|
assert.Check(t, is.Equal(cp, strings.TrimSpace(cli.OutBuffer().String())))
|
|
}
|