toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Automated migration

Browse Source 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
Daniel Nephin
2018-03-05 18:53:52 -05:00
parent 5ef8835f23
commit 39c2ca57c1
158 changed files with 1812 additions and 1727 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cli/command/stack/swarm/deploy_bundlefile_test.go
View File

@ -6,7 +6,8 @@ import (
"path/filepath"
"testing"
"github.com/stretchr/testify/assert"
"github.com/gotestyourself/gotestyourself/assert"
is "github.com/gotestyourself/gotestyourself/assert/cmp"
)
func TestLoadBundlefileErrors(t *testing.T) {
@ -33,7 +34,7 @@ func TestLoadBundlefileErrors(t *testing.T) {
for _, tc := range testCases {
_, err := loadBundlefile(&bytes.Buffer{}, tc.namespace, tc.path)
assert.Error(t, err, tc.expectedError)
assert.Check(t, is.ErrorContains(err, ""), tc.expectedError)
}
}
@ -44,6 +45,6 @@ func TestLoadBundlefile(t *testing.T) {
path := filepath.Join("testdata", "bundlefile_with_two_services.dab")
bundleFile, err := loadBundlefile(buf, namespace, path)
assert.NoError(t, err)
assert.Equal(t, len(bundleFile.Services), 2)
assert.Check(t, err)
assert.Check(t, is.Equal(len(bundleFile.Services), 2))
}

4
cli/command/stack/swarm/deploy_composefile_test.go
View File

@ -6,8 +6,8 @@ import (
"github.com/docker/cli/internal/test/network"
"github.com/docker/cli/internal/test/testutil"
"github.com/docker/docker/api/types"
"github.com/gotestyourself/gotestyourself/assert"
"github.com/pkg/errors"
"github.com/stretchr/testify/assert"
"golang.org/x/net/context"
)
@ -57,7 +57,7 @@ func TestValidateExternalNetworks(t *testing.T) {
networks := []string{testcase.network}
err := validateExternalNetworks(context.Background(), fakeClient, networks)
if testcase.expectedMsg == "" {
assert.NoError(t, err)
assert.Check(t, err)
} else {
testutil.ErrorContains(t, err, testcase.expectedMsg)
}

11
cli/command/stack/swarm/deploy_test.go
View File

@ -7,7 +7,8 @@ import (
"github.com/docker/cli/internal/test"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/swarm"
"github.com/stretchr/testify/assert"
"github.com/gotestyourself/gotestyourself/assert"
is "github.com/gotestyourself/gotestyourself/assert/cmp"
"golang.org/x/net/context"
)
@ -22,7 +23,7 @@ func TestPruneServices(t *testing.T) {
dockerCli := test.NewFakeCli(client)
pruneServices(ctx, dockerCli, namespace, services)
assert.Equal(t, buildObjectIDs([]string{objectName("foo", "remove")}), client.removedServices)
assert.Check(t, is.DeepEqual(buildObjectIDs([]string{objectName("foo", "remove")}), client.removedServices))
}
// TestServiceUpdateResolveImageChanged tests that the service's
@ -93,9 +94,9 @@ func TestServiceUpdateResolveImageChanged(t *testing.T) {
},
}
err := deployServices(ctx, client, spec, namespace, false, ResolveImageChanged)
assert.NoError(t, err)
assert.Equal(t, testcase.expectedQueryRegistry, receivedOptions.QueryRegistry)
assert.Equal(t, testcase.expectedImage, receivedService.TaskTemplate.ContainerSpec.Image)
assert.Check(t, err)
assert.Check(t, is.Equal(testcase.expectedQueryRegistry, receivedOptions.QueryRegistry))
assert.Check(t, is.Equal(testcase.expectedImage, receivedService.TaskTemplate.ContainerSpec.Image))
receivedService = swarm.ServiceSpec{}
receivedOptions = types.ServiceUpdateOptions{}