b9a7f35e02
The validation functions to test for the number of passed arguments did not
pluralize `argument(s)`, and used `argument(s)` in all cases.
This patch adds a simple `pluralize()` helper to improve this.
Before this change, `argument(s)` was used in all cases:
$ docker container ls foobar
"docker container ls" accepts no argument(s).
$ docker network create one two
"docker network create" requires exactly 1 argument(s).
$ docker network connect
"docker network connect" requires exactly 2 argument(s).
$ docker volume create one two
"docker volume create" requires at most 1 argument(s).
After this change, `argument(s)` is properly singularized or plurarized:
$ docker container ls foobar
"docker container ls" accepts no arguments.
$ docker network create one two
"docker network create" requires exactly 1 argument.
$ docker network connect
"docker network connect" requires exactly 2 arguments.
$ docker volume create one two
"docker volume create" requires at most 1 argument.
Test cases were updated accordingly.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
84 lines
2.0 KiB
Go
84 lines
2.0 KiB
Go
package config
|
|
|
|
import (
|
|
"bytes"
|
|
"io/ioutil"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/docker/cli/cli/internal/test"
|
|
"github.com/docker/docker/pkg/testutil"
|
|
"github.com/pkg/errors"
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestConfigRemoveErrors(t *testing.T) {
|
|
testCases := []struct {
|
|
args []string
|
|
configRemoveFunc func(string) error
|
|
expectedError string
|
|
}{
|
|
{
|
|
args: []string{},
|
|
expectedError: "requires at least 1 argument.",
|
|
},
|
|
{
|
|
args: []string{"foo"},
|
|
configRemoveFunc: func(name string) error {
|
|
return errors.Errorf("error removing config")
|
|
},
|
|
expectedError: "error removing config",
|
|
},
|
|
}
|
|
for _, tc := range testCases {
|
|
buf := new(bytes.Buffer)
|
|
cmd := newConfigRemoveCommand(
|
|
test.NewFakeCliWithOutput(&fakeClient{
|
|
configRemoveFunc: tc.configRemoveFunc,
|
|
}, buf),
|
|
)
|
|
cmd.SetArgs(tc.args)
|
|
cmd.SetOutput(ioutil.Discard)
|
|
testutil.ErrorContains(t, cmd.Execute(), tc.expectedError)
|
|
}
|
|
}
|
|
|
|
func TestConfigRemoveWithName(t *testing.T) {
|
|
names := []string{"foo", "bar"}
|
|
buf := new(bytes.Buffer)
|
|
var removedConfigs []string
|
|
cli := test.NewFakeCliWithOutput(&fakeClient{
|
|
configRemoveFunc: func(name string) error {
|
|
removedConfigs = append(removedConfigs, name)
|
|
return nil
|
|
},
|
|
}, buf)
|
|
cmd := newConfigRemoveCommand(cli)
|
|
cmd.SetArgs(names)
|
|
assert.NoError(t, cmd.Execute())
|
|
assert.Equal(t, names, strings.Split(strings.TrimSpace(buf.String()), "\n"))
|
|
assert.Equal(t, names, removedConfigs)
|
|
}
|
|
|
|
func TestConfigRemoveContinueAfterError(t *testing.T) {
|
|
names := []string{"foo", "bar"}
|
|
buf := new(bytes.Buffer)
|
|
var removedConfigs []string
|
|
|
|
cli := test.NewFakeCliWithOutput(&fakeClient{
|
|
configRemoveFunc: func(name string) error {
|
|
removedConfigs = append(removedConfigs, name)
|
|
if name == "foo" {
|
|
return errors.Errorf("error removing config: %s", name)
|
|
}
|
|
return nil
|
|
},
|
|
}, buf)
|
|
|
|
cmd := newConfigRemoveCommand(cli)
|
|
cmd.SetArgs(names)
|
|
cmd.SetOutput(ioutil.Discard)
|
|
assert.EqualError(t, cmd.Execute(), "error removing config: foo")
|
|
assert.Equal(t, names, removedConfigs)
|
|
}
|