6052f2b396
I noticed that we're using a homegrown package for assertions. The functions are extremely similar to testify, but with enough slight differences to be confusing (for example, Equal takes its arguments in a different order). We already vendor testify, and it's used in a few places by tests. I also found some problems with pkg/testutil/assert. For example, the NotNil function seems to be broken. It checks the argument against "nil", which only works for an interface. If you pass in a nil map or slice, the equality check will fail. In the interest of avoiding NIH, I'm proposing replacing pkg/testutil/assert with testify. The test code looks almost the same, but we avoid the confusion of having two similar but slightly different assertion packages, and having to maintain our own package instead of using a commonly-used one. In the process, I found a few places where the tests should halt if an assertion fails, so I've made those cases (that I noticed) use "require" instead of "assert", and I've vendored the "require" package from testify alongside the already-present "assert" package. Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
131 lines
3.9 KiB
Go
131 lines
3.9 KiB
Go
package swarm
|
|
|
|
import (
|
|
"bytes"
|
|
"fmt"
|
|
"io/ioutil"
|
|
"testing"
|
|
|
|
"github.com/docker/docker/api/types"
|
|
"github.com/docker/docker/api/types/swarm"
|
|
"github.com/docker/docker/cli/internal/test"
|
|
"github.com/docker/docker/pkg/testutil"
|
|
"github.com/docker/docker/pkg/testutil/golden"
|
|
"github.com/pkg/errors"
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestSwarmInitErrorOnAPIFailure(t *testing.T) {
|
|
testCases := []struct {
|
|
name string
|
|
flags map[string]string
|
|
swarmInitFunc func() (string, error)
|
|
swarmInspectFunc func() (swarm.Swarm, error)
|
|
swarmGetUnlockKeyFunc func() (types.SwarmUnlockKeyResponse, error)
|
|
nodeInspectFunc func() (swarm.Node, []byte, error)
|
|
expectedError string
|
|
}{
|
|
{
|
|
name: "init-failed",
|
|
swarmInitFunc: func() (string, error) {
|
|
return "", errors.Errorf("error initializing the swarm")
|
|
},
|
|
expectedError: "error initializing the swarm",
|
|
},
|
|
{
|
|
name: "init-failed-with-ip-choice",
|
|
swarmInitFunc: func() (string, error) {
|
|
return "", errors.Errorf("could not choose an IP address to advertise")
|
|
},
|
|
expectedError: "could not choose an IP address to advertise - specify one with --advertise-addr",
|
|
},
|
|
{
|
|
name: "swarm-inspect-after-init-failed",
|
|
swarmInspectFunc: func() (swarm.Swarm, error) {
|
|
return swarm.Swarm{}, errors.Errorf("error inspecting the swarm")
|
|
},
|
|
expectedError: "error inspecting the swarm",
|
|
},
|
|
{
|
|
name: "node-inspect-after-init-failed",
|
|
nodeInspectFunc: func() (swarm.Node, []byte, error) {
|
|
return swarm.Node{}, []byte{}, errors.Errorf("error inspecting the node")
|
|
},
|
|
expectedError: "error inspecting the node",
|
|
},
|
|
{
|
|
name: "swarm-get-unlock-key-after-init-failed",
|
|
flags: map[string]string{
|
|
flagAutolock: "true",
|
|
},
|
|
swarmGetUnlockKeyFunc: func() (types.SwarmUnlockKeyResponse, error) {
|
|
return types.SwarmUnlockKeyResponse{}, errors.Errorf("error getting swarm unlock key")
|
|
},
|
|
expectedError: "could not fetch unlock key: error getting swarm unlock key",
|
|
},
|
|
}
|
|
for _, tc := range testCases {
|
|
buf := new(bytes.Buffer)
|
|
cmd := newInitCommand(
|
|
test.NewFakeCli(&fakeClient{
|
|
swarmInitFunc: tc.swarmInitFunc,
|
|
swarmInspectFunc: tc.swarmInspectFunc,
|
|
swarmGetUnlockKeyFunc: tc.swarmGetUnlockKeyFunc,
|
|
nodeInspectFunc: tc.nodeInspectFunc,
|
|
}, buf))
|
|
for key, value := range tc.flags {
|
|
cmd.Flags().Set(key, value)
|
|
}
|
|
cmd.SetOutput(ioutil.Discard)
|
|
assert.EqualError(t, cmd.Execute(), tc.expectedError)
|
|
}
|
|
}
|
|
|
|
func TestSwarmInit(t *testing.T) {
|
|
testCases := []struct {
|
|
name string
|
|
flags map[string]string
|
|
swarmInitFunc func() (string, error)
|
|
swarmInspectFunc func() (swarm.Swarm, error)
|
|
swarmGetUnlockKeyFunc func() (types.SwarmUnlockKeyResponse, error)
|
|
nodeInspectFunc func() (swarm.Node, []byte, error)
|
|
}{
|
|
{
|
|
name: "init",
|
|
swarmInitFunc: func() (string, error) {
|
|
return "nodeID", nil
|
|
},
|
|
},
|
|
{
|
|
name: "init-autolock",
|
|
flags: map[string]string{
|
|
flagAutolock: "true",
|
|
},
|
|
swarmInitFunc: func() (string, error) {
|
|
return "nodeID", nil
|
|
},
|
|
swarmGetUnlockKeyFunc: func() (types.SwarmUnlockKeyResponse, error) {
|
|
return types.SwarmUnlockKeyResponse{
|
|
UnlockKey: "unlock-key",
|
|
}, nil
|
|
},
|
|
},
|
|
}
|
|
for _, tc := range testCases {
|
|
buf := new(bytes.Buffer)
|
|
cmd := newInitCommand(
|
|
test.NewFakeCli(&fakeClient{
|
|
swarmInitFunc: tc.swarmInitFunc,
|
|
swarmInspectFunc: tc.swarmInspectFunc,
|
|
swarmGetUnlockKeyFunc: tc.swarmGetUnlockKeyFunc,
|
|
nodeInspectFunc: tc.nodeInspectFunc,
|
|
}, buf))
|
|
for key, value := range tc.flags {
|
|
cmd.Flags().Set(key, value)
|
|
}
|
|
assert.NoError(t, cmd.Execute())
|
|
actual := buf.String()
|
|
expected := golden.Get(t, []byte(actual), fmt.Sprintf("init-%s.golden", tc.name))
|
|
testutil.EqualNormalizedString(t, testutil.RemoveSpace, actual, string(expected))
|
|
}
|
|
}
|