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>
42 lines
1.0 KiB
Go
42 lines
1.0 KiB
Go
package network
|
|
|
|
import (
|
|
"io/ioutil"
|
|
"testing"
|
|
|
|
"github.com/docker/cli/cli/internal/test"
|
|
"github.com/docker/docker/pkg/testutil"
|
|
"github.com/pkg/errors"
|
|
"golang.org/x/net/context"
|
|
)
|
|
|
|
func TestNetworkDisconnectErrors(t *testing.T) {
|
|
testCases := []struct {
|
|
args []string
|
|
networkDisconnectFunc func(ctx context.Context, networkID, container string, force bool) error
|
|
expectedError string
|
|
}{
|
|
{
|
|
expectedError: "requires exactly 2 arguments",
|
|
},
|
|
{
|
|
args: []string{"toto", "titi"},
|
|
networkDisconnectFunc: func(ctx context.Context, networkID, container string, force bool) error {
|
|
return errors.Errorf("error disconnecting network")
|
|
},
|
|
expectedError: "error disconnecting network",
|
|
},
|
|
}
|
|
|
|
for _, tc := range testCases {
|
|
cmd := newDisconnectCommand(
|
|
test.NewFakeCli(&fakeClient{
|
|
networkDisconnectFunc: tc.networkDisconnectFunc,
|
|
}),
|
|
)
|
|
cmd.SetArgs(tc.args)
|
|
cmd.SetOutput(ioutil.Discard)
|
|
testutil.ErrorContains(t, cmd.Execute(), tc.expectedError)
|
|
}
|
|
}
|