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>
51 lines
1.1 KiB
Go
51 lines
1.1 KiB
Go
package swarm
|
|
|
|
import (
|
|
"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 TestSwarmLeaveErrors(t *testing.T) {
|
|
testCases := []struct {
|
|
name string
|
|
args []string
|
|
swarmLeaveFunc func() error
|
|
expectedError string
|
|
}{
|
|
{
|
|
name: "too-many-args",
|
|
args: []string{"foo"},
|
|
expectedError: "accepts no arguments",
|
|
},
|
|
{
|
|
name: "leave-failed",
|
|
swarmLeaveFunc: func() error {
|
|
return errors.Errorf("error leaving the swarm")
|
|
},
|
|
expectedError: "error leaving the swarm",
|
|
},
|
|
}
|
|
for _, tc := range testCases {
|
|
cmd := newLeaveCommand(
|
|
test.NewFakeCli(&fakeClient{
|
|
swarmLeaveFunc: tc.swarmLeaveFunc,
|
|
}))
|
|
cmd.SetArgs(tc.args)
|
|
cmd.SetOutput(ioutil.Discard)
|
|
testutil.ErrorContains(t, cmd.Execute(), tc.expectedError)
|
|
}
|
|
}
|
|
|
|
func TestSwarmLeave(t *testing.T) {
|
|
cli := test.NewFakeCli(&fakeClient{})
|
|
cmd := newLeaveCommand(cli)
|
|
assert.NoError(t, cmd.Execute())
|
|
assert.Equal(t, "Node left the swarm.", strings.TrimSpace(cli.OutBuffer().String()))
|
|
}
|