Merge pull request #1121 from vdemeester/gotestyourself-with-tools

Update gotestyourself to gotest.tools

cli/command/bundlefile/bundlefile_test.go

@@ -5,8 +5,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	is "gotest.tools/assert/cmp"
 )
 
 func TestLoadFileV01Success(t *testing.T) {

cli/command/checkpoint/create_test.go

@@ -7,9 +7,9 @@ import (
 
 	"github.com/docker/cli/internal/test"
 	"github.com/docker/docker/api/types"
-	"github.com/gotestyourself/gotestyourself/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
 	"github.com/pkg/errors"
+	"gotest.tools/assert"
+	is "gotest.tools/assert/cmp"
 )
 
 func TestCheckpointCreateErrors(t *testing.T) {

cli/command/checkpoint/list_test.go

@@ -6,10 +6,10 @@ import (
 
 	"github.com/docker/cli/internal/test"
 	"github.com/docker/docker/api/types"
-	"github.com/gotestyourself/gotestyourself/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
-	"github.com/gotestyourself/gotestyourself/golden"
 	"github.com/pkg/errors"
+	"gotest.tools/assert"
+	is "gotest.tools/assert/cmp"
+	"gotest.tools/golden"
 )
 
 func TestCheckpointListErrors(t *testing.T) {

cli/command/checkpoint/remove_test.go

@@ -6,9 +6,9 @@ import (
 
 	"github.com/docker/cli/internal/test"
 	"github.com/docker/docker/api/types"
-	"github.com/gotestyourself/gotestyourself/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
 	"github.com/pkg/errors"
+	"gotest.tools/assert"
+	is "gotest.tools/assert/cmp"
 )
 
 func TestCheckpointRemoveErrors(t *testing.T) {

cli/command/cli_test.go

@@ -13,11 +13,11 @@ import (
 	"github.com/docker/docker/api"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/client"
-	"github.com/gotestyourself/gotestyourself/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
-	"github.com/gotestyourself/gotestyourself/env"
-	"github.com/gotestyourself/gotestyourself/fs"
 	"github.com/pkg/errors"
+	"gotest.tools/assert"
+	is "gotest.tools/assert/cmp"
+	"gotest.tools/env"
+	"gotest.tools/fs"
 )
 
 func TestNewAPIClientFromFlags(t *testing.T) {

cli/command/config/create_test.go

@@ -10,10 +10,10 @@ import (
 	"github.com/docker/cli/internal/test"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/swarm"
-	"github.com/gotestyourself/gotestyourself/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
-	"github.com/gotestyourself/gotestyourself/golden"
 	"github.com/pkg/errors"
+	"gotest.tools/assert"
+	is "gotest.tools/assert/cmp"
+	"gotest.tools/golden"
 )
 
 const configDataFile = "config-create-with-name.golden"

cli/command/config/inspect_test.go

@@ -11,8 +11,8 @@ import (
 	"github.com/pkg/errors"
 	// Import builders to get the builder function as package function
 	. "github.com/docker/cli/internal/test/builders"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	"github.com/gotestyourself/gotestyourself/golden"
+	"gotest.tools/golden"
 )
 
 func TestConfigInspectErrors(t *testing.T) {

cli/command/config/ls_test.go

@@ -12,9 +12,9 @@ import (
 	"github.com/pkg/errors"
 	// Import builders to get the builder function as package function
 	. "github.com/docker/cli/internal/test/builders"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	is "gotest.tools/assert/cmp"
-	"github.com/gotestyourself/gotestyourself/golden"
+	"gotest.tools/golden"
 )
 
 func TestConfigListErrors(t *testing.T) {

cli/command/config/remove_test.go

@@ -6,9 +6,9 @@ import (
 	"testing"
 
 	"github.com/docker/cli/internal/test"
-	"github.com/gotestyourself/gotestyourself/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
 	"github.com/pkg/errors"
+	"gotest.tools/assert"
+	is "gotest.tools/assert/cmp"
 )
 
 func TestConfigRemoveErrors(t *testing.T) {

cli/command/container/attach_test.go

@@ -9,8 +9,8 @@ import (
 	"github.com/docker/cli/internal/test"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
-	"github.com/gotestyourself/gotestyourself/assert"
 	"github.com/pkg/errors"
+	"gotest.tools/assert"
 )
 
 func TestNewAttachCommandErrors(t *testing.T) {

cli/command/container/cp_test.go

@@ -11,10 +11,10 @@ import (
 	"github.com/docker/cli/internal/test"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/pkg/archive"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	is "gotest.tools/assert/cmp"
-	"github.com/gotestyourself/gotestyourself/fs"
+	"gotest.tools/fs"
-	"github.com/gotestyourself/gotestyourself/skip"
+	"gotest.tools/skip"
 )
 
 func TestRunCopyWithInvalidArguments(t *testing.T) {
@@ -182,7 +182,7 @@ func TestSplitCpArg(t *testing.T) {
 	}
 	for _, testcase := range testcases {
 		t.Run(testcase.doc, func(t *testing.T) {
-			skip.IfCondition(t, testcase.os != "" && testcase.os != runtime.GOOS)
+			skip.If(t, testcase.os != "" && testcase.os != runtime.GOOS)
 
 			container, path := splitCpArg(testcase.path)
 			assert.Check(t, is.Equal(testcase.expectedContainer, container))

cli/command/container/create_test.go

@@ -16,10 +16,10 @@ import (
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/network"
 	"github.com/google/go-cmp/cmp"
-	"github.com/gotestyourself/gotestyourself/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
-	"github.com/gotestyourself/gotestyourself/fs"
 	"github.com/pkg/errors"
+	"gotest.tools/assert"
+	is "gotest.tools/assert/cmp"
+	"gotest.tools/fs"
 )
 
 func TestCIDFileNoOPWithNoFilename(t *testing.T) {

cli/command/container/exec_test.go

@@ -10,9 +10,9 @@ import (
 	"github.com/docker/cli/internal/test"
 	"github.com/docker/cli/opts"
 	"github.com/docker/docker/api/types"
-	"github.com/gotestyourself/gotestyourself/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
 	"github.com/pkg/errors"
+	"gotest.tools/assert"
+	is "gotest.tools/assert/cmp"
 )
 
 func withDefaultOpts(options execOptions) execOptions {

cli/command/container/list_test.go

@@ -10,8 +10,8 @@ import (
 	"github.com/docker/docker/api/types"
 	// Import builders to get the builder function as package function
 	. "github.com/docker/cli/internal/test/builders"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	"github.com/gotestyourself/gotestyourself/golden"
+	"gotest.tools/golden"
 )
 
 func TestContainerListErrors(t *testing.T) {

cli/command/container/logs_test.go

@@ -9,8 +9,8 @@ import (
 	"github.com/docker/cli/internal/test"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	is "gotest.tools/assert/cmp"
 )
 
 var logFn = func(expectedOut string) func(string, types.ContainerLogsOptions) (io.ReadCloser, error) {

cli/command/container/opts_test.go

@@ -12,10 +12,10 @@ import (
 	"github.com/docker/docker/api/types/container"
 	networktypes "github.com/docker/docker/api/types/network"
 	"github.com/docker/go-connections/nat"
-	"github.com/gotestyourself/gotestyourself/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
 	"github.com/pkg/errors"
 	"github.com/spf13/pflag"
+	"gotest.tools/assert"
+	is "gotest.tools/assert/cmp"
 )
 
 func TestValidateAttach(t *testing.T) {

cli/command/container/ps_test.go

@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	"github.com/docker/cli/opts"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	is "gotest.tools/assert/cmp"
 )
 
 func TestBuildContainerListOptions(t *testing.T) {

cli/command/container/run_test.go

@@ -8,8 +8,8 @@ import (
 	"github.com/docker/cli/internal/test/notary"
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/network"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	is "gotest.tools/assert/cmp"
 )
 
 func TestRunLabel(t *testing.T) {

cli/command/container/stats_helpers_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/docker/docker/api/types"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
 )
 
 func TestCalculateMemUsageUnixNoCache(t *testing.T) {

cli/command/container/utils_test.go

@@ -8,9 +8,9 @@ import (
 	"github.com/docker/cli/internal/test"
 	"github.com/docker/docker/api"
 	"github.com/docker/docker/api/types/container"
-	"github.com/gotestyourself/gotestyourself/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
 	"github.com/pkg/errors"
+	"gotest.tools/assert"
+	is "gotest.tools/assert/cmp"
 )
 
 func waitFn(cid string) (<-chan container.ContainerWaitOKBody, <-chan error) {

cli/command/formatter/checkpoint_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/docker/docker/api/types"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
 )
 
 func TestCheckpointContextFormatWrite(t *testing.T) {

cli/command/formatter/config_test.go

@@ -6,8 +6,8 @@ import (
 	"time"
 
 	"github.com/docker/docker/api/types/swarm"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	is "gotest.tools/assert/cmp"
 )
 
 func TestConfigContextFormatWrite(t *testing.T) {

cli/command/formatter/container_test.go

@@ -10,9 +10,9 @@ import (
 
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/pkg/stringid"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	is "gotest.tools/assert/cmp"
-	"github.com/gotestyourself/gotestyourself/golden"
+	"gotest.tools/golden"
 )
 
 func TestContainerPsContext(t *testing.T) {

cli/command/formatter/custom_test.go

@@ -4,8 +4,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	is "gotest.tools/assert/cmp"
 )
 
 func compareMultipleValues(t *testing.T, value, expected string) {

cli/command/formatter/diff_test.go

@@ -6,8 +6,8 @@ import (
 
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/pkg/archive"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	is "gotest.tools/assert/cmp"
 )
 
 func TestDiffContextFormatWrite(t *testing.T) {

cli/command/formatter/disk_usage_test.go

@@ -4,9 +4,9 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	is "gotest.tools/assert/cmp"
-	"github.com/gotestyourself/gotestyourself/golden"
+	"gotest.tools/golden"
 )
 
 func TestDiskUsageContextFormatWrite(t *testing.T) {

cli/command/formatter/displayutils_test.go

@@ -3,8 +3,8 @@ package formatter
 import (
 	"testing"
 
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	is "gotest.tools/assert/cmp"
 )
 
 func TestEllipsis(t *testing.T) {

cli/command/formatter/history_test.go

@@ -9,8 +9,8 @@ import (
 
 	"github.com/docker/docker/api/types/image"
 	"github.com/docker/docker/pkg/stringid"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	is "gotest.tools/assert/cmp"
 )
 
 type historyCase struct {

cli/command/formatter/image_test.go

@@ -9,8 +9,8 @@ import (
 
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/pkg/stringid"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	is "gotest.tools/assert/cmp"
 )
 
 func TestImageContext(t *testing.T) {

cli/command/formatter/network_test.go

@@ -10,8 +10,8 @@ import (
 
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/pkg/stringid"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	is "gotest.tools/assert/cmp"
 )
 
 func TestNetworkContext(t *testing.T) {

cli/command/formatter/node_test.go

@@ -10,8 +10,8 @@ import (
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/swarm"
 	"github.com/docker/docker/pkg/stringid"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	is "gotest.tools/assert/cmp"
 )
 
 func TestNodeContext(t *testing.T) {

cli/command/formatter/plugin_test.go

@@ -8,8 +8,8 @@ import (
 
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/pkg/stringid"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	is "gotest.tools/assert/cmp"
 )
 
 func TestPluginContext(t *testing.T) {

cli/command/formatter/search_test.go

@@ -7,9 +7,9 @@ import (
 	"testing"
 
 	registrytypes "github.com/docker/docker/api/types/registry"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	is "gotest.tools/assert/cmp"
-	"github.com/gotestyourself/gotestyourself/golden"
+	"gotest.tools/golden"
 )
 
 func TestSearchContext(t *testing.T) {

cli/command/formatter/secret_test.go

@@ -6,8 +6,8 @@ import (
 	"time"
 
 	"github.com/docker/docker/api/types/swarm"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	is "gotest.tools/assert/cmp"
 )
 
 func TestSecretContextFormatWrite(t *testing.T) {

cli/command/formatter/service_test.go

@@ -8,9 +8,9 @@ import (
 	"testing"
 
 	"github.com/docker/docker/api/types/swarm"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	is "gotest.tools/assert/cmp"
-	"github.com/gotestyourself/gotestyourself/golden"
+	"gotest.tools/golden"
 )
 
 func TestServiceContextWrite(t *testing.T) {

cli/command/formatter/stack_test.go

@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	is "gotest.tools/assert/cmp"
 )
 
 func TestStackContextWrite(t *testing.T) {

cli/command/formatter/stats_test.go

@@ -5,8 +5,8 @@ import (
 	"testing"
 
 	"github.com/docker/docker/pkg/stringid"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	is "gotest.tools/assert/cmp"
 )
 
 func TestContainerStatsContext(t *testing.T) {

cli/command/formatter/task_test.go

@@ -7,9 +7,9 @@ import (
 	"testing"
 
 	"github.com/docker/docker/api/types/swarm"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	is "gotest.tools/assert/cmp"
-	"github.com/gotestyourself/gotestyourself/golden"
+	"gotest.tools/golden"
 )
 
 func TestTaskContextWrite(t *testing.T) {

cli/command/formatter/trust_test.go

@@ -5,8 +5,8 @@ import (
 	"testing"
 
 	"github.com/docker/docker/pkg/stringid"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	is "gotest.tools/assert/cmp"
 )
 
 func TestTrustTag(t *testing.T) {

cli/command/formatter/volume_test.go

@@ -9,8 +9,8 @@ import (
 
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/pkg/stringid"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	is "gotest.tools/assert/cmp"
 )
 
 func TestVolumeContext(t *testing.T) {

cli/command/idresolver/idresolver_test.go

@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	"github.com/docker/docker/api/types/swarm"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	is "gotest.tools/assert/cmp"
 	// Import builders to get the builder function as package function
 	"context"
 

cli/command/image/build/context_test.go

@@ -12,8 +12,8 @@ import (
 	"testing"
 
 	"github.com/docker/docker/pkg/archive"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	is "gotest.tools/assert/cmp"
 )
 
 const dockerfileContents = "FROM busybox"

cli/command/image/build_test.go

@@ -17,9 +17,9 @@ import (
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/pkg/archive"
 	"github.com/google/go-cmp/cmp"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	"github.com/gotestyourself/gotestyourself/fs"
+	"gotest.tools/fs"
-	"github.com/gotestyourself/gotestyourself/skip"
+	"gotest.tools/skip"
 )
 
 func TestRunBuildDockerfileFromStdinWithCompress(t *testing.T) {

cli/command/image/history_test.go

@@ -8,10 +8,10 @@ import (
 
 	"github.com/docker/cli/internal/test"
 	"github.com/docker/docker/api/types/image"
-	"github.com/gotestyourself/gotestyourself/assert"
-	"github.com/gotestyourself/gotestyourself/golden"
-	"github.com/gotestyourself/gotestyourself/skip"
 	"github.com/pkg/errors"
+	"gotest.tools/assert"
+	"gotest.tools/golden"
+	"gotest.tools/skip"
 )
 
 func TestNewHistoryCommandErrors(t *testing.T) {

cli/command/image/import_test.go

@@ -8,9 +8,9 @@ import (
 
 	"github.com/docker/cli/internal/test"
 	"github.com/docker/docker/api/types"
-	"github.com/gotestyourself/gotestyourself/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
 	"github.com/pkg/errors"
+	"gotest.tools/assert"
+	is "gotest.tools/assert/cmp"
 )
 
 func TestNewImportCommandErrors(t *testing.T) {

cli/command/image/inspect_test.go

@@ -7,9 +7,9 @@ import (
 
 	"github.com/docker/cli/internal/test"
 	"github.com/docker/docker/api/types"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	is "gotest.tools/assert/cmp"
-	"github.com/gotestyourself/gotestyourself/golden"
+	"gotest.tools/golden"
 )
 
 func TestNewInspectCommandErrors(t *testing.T) {

cli/command/image/list_test.go

@@ -8,10 +8,10 @@ import (
 	"github.com/docker/cli/cli/config/configfile"
 	"github.com/docker/cli/internal/test"
 	"github.com/docker/docker/api/types"
-	"github.com/gotestyourself/gotestyourself/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
-	"github.com/gotestyourself/gotestyourself/golden"
 	"github.com/pkg/errors"
+	"gotest.tools/assert"
+	is "gotest.tools/assert/cmp"
+	"gotest.tools/golden"
 )
 
 func TestNewImagesCommandErrors(t *testing.T) {

cli/command/image/load_test.go

@@ -9,9 +9,9 @@ import (
 
 	"github.com/docker/cli/internal/test"
 	"github.com/docker/docker/api/types"
-	"github.com/gotestyourself/gotestyourself/assert"
-	"github.com/gotestyourself/gotestyourself/golden"
 	"github.com/pkg/errors"
+	"gotest.tools/assert"
+	"gotest.tools/golden"
 )
 
 func TestNewLoadCommandErrors(t *testing.T) {

cli/command/image/prune_test.go

@@ -8,10 +8,10 @@ import (
 	"github.com/docker/cli/internal/test"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
-	"github.com/gotestyourself/gotestyourself/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
-	"github.com/gotestyourself/gotestyourself/golden"
 	"github.com/pkg/errors"
+	"gotest.tools/assert"
+	is "gotest.tools/assert/cmp"
+	"gotest.tools/golden"
 )
 
 func TestNewPruneCommandErrors(t *testing.T) {

cli/command/image/pull_test.go

@@ -10,9 +10,9 @@ import (
 	"github.com/docker/cli/internal/test"
 	"github.com/docker/cli/internal/test/notary"
 	"github.com/docker/docker/api/types"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	is "gotest.tools/assert/cmp"
-	"github.com/gotestyourself/gotestyourself/golden"
+	"gotest.tools/golden"
 )
 
 func TestNewPullCommandErrors(t *testing.T) {

cli/command/image/push_test.go

@@ -8,8 +8,8 @@ import (
 
 	"github.com/docker/cli/internal/test"
 	"github.com/docker/docker/api/types"
-	"github.com/gotestyourself/gotestyourself/assert"
 	"github.com/pkg/errors"
+	"gotest.tools/assert"
 )
 
 func TestNewPushCommandErrors(t *testing.T) {

cli/command/image/remove_test.go

@@ -7,10 +7,10 @@ import (
 
 	"github.com/docker/cli/internal/test"
 	"github.com/docker/docker/api/types"
-	"github.com/gotestyourself/gotestyourself/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
-	"github.com/gotestyourself/gotestyourself/golden"
 	"github.com/pkg/errors"
+	"gotest.tools/assert"
+	is "gotest.tools/assert/cmp"
+	"gotest.tools/golden"
 )
 
 type notFound struct {

cli/command/image/save_test.go

@@ -8,9 +8,9 @@ import (
 	"testing"
 
 	"github.com/docker/cli/internal/test"
-	"github.com/gotestyourself/gotestyourself/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
 	"github.com/pkg/errors"
+	"gotest.tools/assert"
+	is "gotest.tools/assert/cmp"
 )
 
 func TestNewSaveCommandErrors(t *testing.T) {

cli/command/image/tag_test.go

@@ -5,8 +5,8 @@ import (
 	"testing"
 
 	"github.com/docker/cli/internal/test"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	is "gotest.tools/assert/cmp"
 )
 
 func TestCliNewTagCommandErrors(t *testing.T) {

cli/command/image/trust_test.go

@@ -7,10 +7,10 @@ import (
 
 	"github.com/docker/cli/cli/trust"
 	registrytypes "github.com/docker/docker/api/types/registry"
-	"github.com/gotestyourself/gotestyourself/assert"
 	"github.com/theupdateframework/notary/client"
 	"github.com/theupdateframework/notary/passphrase"
 	"github.com/theupdateframework/notary/trustpinning"
+	"gotest.tools/assert"
 )
 
 func unsetENV() {

cli/command/inspect/inspector_test.go

@@ -6,8 +6,8 @@ import (
 	"testing"
 
 	"github.com/docker/cli/templates"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	is "gotest.tools/assert/cmp"
 )
 
 type testElement struct {

cli/command/manifest/annotate_test.go

@@ -5,9 +5,9 @@ import (
 	"testing"
 
 	"github.com/docker/cli/internal/test"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	is "gotest.tools/assert/cmp"
-	"github.com/gotestyourself/gotestyourself/golden"
+	"gotest.tools/golden"
 )
 
 func TestManifestAnnotateError(t *testing.T) {

cli/command/manifest/create_test.go

@@ -8,10 +8,10 @@ import (
 	manifesttypes "github.com/docker/cli/cli/manifest/types"
 	"github.com/docker/cli/internal/test"
 	"github.com/docker/distribution/reference"
-	"github.com/gotestyourself/gotestyourself/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
-	"github.com/gotestyourself/gotestyourself/golden"
 	"github.com/pkg/errors"
+	"gotest.tools/assert"
+	is "gotest.tools/assert/cmp"
+	"gotest.tools/golden"
 )
 
 func TestManifestCreateErrors(t *testing.T) {

cli/command/manifest/inspect_test.go

@@ -13,11 +13,11 @@ import (
 	"github.com/docker/distribution"
 	"github.com/docker/distribution/manifest/schema2"
 	"github.com/docker/distribution/reference"
-	"github.com/gotestyourself/gotestyourself/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
-	"github.com/gotestyourself/gotestyourself/golden"
 	digest "github.com/opencontainers/go-digest"
 	"github.com/pkg/errors"
+	"gotest.tools/assert"
+	is "gotest.tools/assert/cmp"
+	"gotest.tools/golden"
 )
 
 func newTempManifestStore(t *testing.T) (store.Store, func()) {

cli/command/manifest/push_test.go

@@ -8,8 +8,8 @@ import (
 	manifesttypes "github.com/docker/cli/cli/manifest/types"
 	"github.com/docker/cli/internal/test"
 	"github.com/docker/distribution/reference"
-	"github.com/gotestyourself/gotestyourself/assert"
 	"github.com/pkg/errors"
+	"gotest.tools/assert"
 )
 
 func newFakeRegistryClient() *fakeRegistryClient {

cli/command/network/connect_test.go

@@ -7,9 +7,9 @@ import (
 
 	"github.com/docker/cli/internal/test"
 	"github.com/docker/docker/api/types/network"
-	"github.com/gotestyourself/gotestyourself/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
 	"github.com/pkg/errors"
+	"gotest.tools/assert"
+	is "gotest.tools/assert/cmp"
 )
 
 func TestNetworkConnectErrors(t *testing.T) {

cli/command/network/create_test.go

@@ -9,9 +9,9 @@ import (
 	"github.com/docker/cli/internal/test"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/network"
-	"github.com/gotestyourself/gotestyourself/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
 	"github.com/pkg/errors"
+	"gotest.tools/assert"
+	is "gotest.tools/assert/cmp"
 )
 
 func TestNetworkCreateErrors(t *testing.T) {

cli/command/network/disconnect_test.go

@@ -6,8 +6,8 @@ import (
 	"testing"
 
 	"github.com/docker/cli/internal/test"
-	"github.com/gotestyourself/gotestyourself/assert"
 	"github.com/pkg/errors"
+	"gotest.tools/assert"
 )
 
 func TestNetworkDisconnectErrors(t *testing.T) {

cli/command/network/list_test.go

@@ -11,10 +11,10 @@ import (
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
 	"github.com/google/go-cmp/cmp"
-	"github.com/gotestyourself/gotestyourself/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
-	"github.com/gotestyourself/gotestyourself/golden"
 	"github.com/pkg/errors"
+	"gotest.tools/assert"
+	is "gotest.tools/assert/cmp"
+	"gotest.tools/golden"
 )
 
 func TestNetworkListErrors(t *testing.T) {

cli/command/node/demote_test.go

@@ -6,8 +6,8 @@ import (
 
 	"github.com/docker/cli/internal/test"
 	"github.com/docker/docker/api/types/swarm"
-	"github.com/gotestyourself/gotestyourself/assert"
 	"github.com/pkg/errors"
+	"gotest.tools/assert"
 	// Import builders to get the builder function as package function
 	. "github.com/docker/cli/internal/test/builders"
 )

cli/command/node/inspect_test.go

@@ -11,8 +11,8 @@ import (
 	"github.com/pkg/errors"
 	// Import builders to get the builder function as package function
 	. "github.com/docker/cli/internal/test/builders"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	"github.com/gotestyourself/gotestyourself/golden"
+	"gotest.tools/golden"
 )
 
 func TestNodeInspectErrors(t *testing.T) {

cli/command/node/list_test.go

@@ -8,10 +8,10 @@ import (
 	"github.com/docker/cli/internal/test"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/swarm"
-	"github.com/gotestyourself/gotestyourself/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
-	"github.com/gotestyourself/gotestyourself/golden"
 	"github.com/pkg/errors"
+	"gotest.tools/assert"
+	is "gotest.tools/assert/cmp"
+	"gotest.tools/golden"
 	// Import builders to get the builder function as package function
 	. "github.com/docker/cli/internal/test/builders"
 )

cli/command/node/promote_test.go

@@ -6,8 +6,8 @@ import (
 
 	"github.com/docker/cli/internal/test"
 	"github.com/docker/docker/api/types/swarm"
-	"github.com/gotestyourself/gotestyourself/assert"
 	"github.com/pkg/errors"
+	"gotest.tools/assert"
 	// Import builders to get the builder function as package function
 	. "github.com/docker/cli/internal/test/builders"
 )

cli/command/node/ps_test.go

@@ -12,8 +12,8 @@ import (
 	"github.com/pkg/errors"
 	// Import builders to get the builder function as package function
 	. "github.com/docker/cli/internal/test/builders"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	"github.com/gotestyourself/gotestyourself/golden"
+	"gotest.tools/golden"
 )
 
 func TestNodePsErrors(t *testing.T) {

cli/command/node/remove_test.go

@@ -5,8 +5,8 @@ import (
 	"testing"
 
 	"github.com/docker/cli/internal/test"
-	"github.com/gotestyourself/gotestyourself/assert"
 	"github.com/pkg/errors"
+	"gotest.tools/assert"
 )
 
 func TestNodeRemoveErrors(t *testing.T) {

cli/command/node/update_test.go

@@ -6,8 +6,8 @@ import (
 
 	"github.com/docker/cli/internal/test"
 	"github.com/docker/docker/api/types/swarm"
-	"github.com/gotestyourself/gotestyourself/assert"
 	"github.com/pkg/errors"
+	"gotest.tools/assert"
 	// Import builders to get the builder function as package function
 	. "github.com/docker/cli/internal/test/builders"
 )

cli/command/plugin/create_test.go

@@ -9,9 +9,9 @@ import (
 
 	"github.com/docker/cli/internal/test"
 	"github.com/docker/docker/api/types"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	is "gotest.tools/assert/cmp"
-	"github.com/gotestyourself/gotestyourself/fs"
+	"gotest.tools/fs"
 )
 
 func TestCreateErrors(t *testing.T) {

cli/command/plugin/disable_test.go

@@ -7,8 +7,8 @@ import (
 
 	"github.com/docker/cli/internal/test"
 	"github.com/docker/docker/api/types"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	is "gotest.tools/assert/cmp"
 )
 
 func TestPluginDisableErrors(t *testing.T) {

cli/command/plugin/enable_test.go

@@ -7,8 +7,8 @@ import (
 
 	"github.com/docker/cli/internal/test"
 	"github.com/docker/docker/api/types"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	is "gotest.tools/assert/cmp"
 )
 
 func TestPluginEnableErrors(t *testing.T) {

cli/command/plugin/remove_test.go

@@ -7,8 +7,8 @@ import (
 
 	"github.com/docker/cli/internal/test"
 	"github.com/docker/docker/api/types"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	is "gotest.tools/assert/cmp"
 )
 
 func TestRemoveErrors(t *testing.T) {

cli/command/registry/login_test.go

@@ -10,9 +10,9 @@ import (
 	"github.com/docker/docker/api/types"
 	registrytypes "github.com/docker/docker/api/types/registry"
 	"github.com/docker/docker/client"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	is "gotest.tools/assert/cmp"
-	"github.com/gotestyourself/gotestyourself/fs"
+	"gotest.tools/fs"
 )
 
 const userErr = "userunknownError"

cli/command/registry_test.go

@@ -6,9 +6,9 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/gotestyourself/gotestyourself/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
 	"github.com/pkg/errors"
+	"gotest.tools/assert"
+	is "gotest.tools/assert/cmp"
 
 	// Prevents a circular import with "github.com/docker/cli/internal/test"
 

cli/command/secret/create_test.go

@@ -10,9 +10,9 @@ import (
 	"github.com/docker/cli/internal/test"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/swarm"
-	"github.com/gotestyourself/gotestyourself/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
 	"github.com/pkg/errors"
+	"gotest.tools/assert"
+	is "gotest.tools/assert/cmp"
 )
 
 const secretDataFile = "secret-create-with-name.golden"

cli/command/secret/inspect_test.go

@@ -11,8 +11,8 @@ import (
 	"github.com/pkg/errors"
 	// Import builders to get the builder function as package function
 	. "github.com/docker/cli/internal/test/builders"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	"github.com/gotestyourself/gotestyourself/golden"
+	"gotest.tools/golden"
 )
 
 func TestSecretInspectErrors(t *testing.T) {

cli/command/secret/ls_test.go

@@ -12,9 +12,9 @@ import (
 	"github.com/pkg/errors"
 	// Import builders to get the builder function as package function
 	. "github.com/docker/cli/internal/test/builders"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	is "gotest.tools/assert/cmp"
-	"github.com/gotestyourself/gotestyourself/golden"
+	"gotest.tools/golden"
 )
 
 func TestSecretListErrors(t *testing.T) {

cli/command/secret/remove_test.go

@@ -6,9 +6,9 @@ import (
 	"testing"
 
 	"github.com/docker/cli/internal/test"
-	"github.com/gotestyourself/gotestyourself/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
 	"github.com/pkg/errors"
+	"gotest.tools/assert"
+	is "gotest.tools/assert/cmp"
 )
 
 func TestSecretRemoveErrors(t *testing.T) {

cli/command/service/generic_resource_opts_test.go

@@ -3,8 +3,8 @@ package service
 import (
 	"testing"
 
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	is "gotest.tools/assert/cmp"
 )
 
 func TestValidateSingleGenericResource(t *testing.T) {

cli/command/service/inspect_test.go

@@ -10,8 +10,8 @@ import (
 	"github.com/docker/cli/cli/command/formatter"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/swarm"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	is "gotest.tools/assert/cmp"
 )
 
 func formatServiceInspect(t *testing.T, format formatter.Format, now time.Time) string {

cli/command/service/list_test.go

@@ -7,8 +7,8 @@ import (
 	"github.com/docker/cli/internal/test"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/swarm"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	"github.com/gotestyourself/gotestyourself/golden"
+	"gotest.tools/golden"
 )
 
 func TestServiceListOrder(t *testing.T) {

cli/command/service/opts_test.go

@@ -10,8 +10,8 @@ import (
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/swarm"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	is "gotest.tools/assert/cmp"
 )
 
 func TestMemBytesString(t *testing.T) {

cli/command/service/progress/progress_test.go

@@ -7,8 +7,8 @@ import (
 
 	"github.com/docker/docker/api/types/swarm"
 	"github.com/docker/docker/pkg/progress"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	is "gotest.tools/assert/cmp"
 )
 
 type mockProgress struct {

cli/command/service/ps_test.go

@@ -10,8 +10,8 @@ import (
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/api/types/swarm"
 	"github.com/google/go-cmp/cmp"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	is "gotest.tools/assert/cmp"
 )
 
 func TestCreateFilter(t *testing.T) {

cli/command/service/rollback_test.go

@@ -10,8 +10,8 @@ import (
 	"github.com/docker/cli/internal/test"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/swarm"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	is "gotest.tools/assert/cmp"
 )
 
 func TestRollback(t *testing.T) {

cli/command/service/update_test.go

@@ -12,8 +12,8 @@ import (
 	"github.com/docker/docker/api/types/container"
 	mounttypes "github.com/docker/docker/api/types/mount"
 	"github.com/docker/docker/api/types/swarm"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	is "gotest.tools/assert/cmp"
 )
 
 func TestUpdateServiceArgs(t *testing.T) {

cli/command/stack/kubernetes/conversion_test.go

@@ -6,7 +6,7 @@ import (
 	"github.com/docker/cli/cli/command/formatter"
 	"github.com/docker/cli/kubernetes/labels"
 	"github.com/docker/docker/api/types/swarm"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
 	appsv1beta2 "k8s.io/api/apps/v1beta2"
 	apiv1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

cli/command/stack/kubernetes/services_test.go

@@ -5,8 +5,8 @@ import (
 
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/api/types/swarm"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	"github.com/gotestyourself/gotestyourself/assert/cmp"
+	"gotest.tools/assert/cmp"
 )
 
 func TestServiceFiltersLabelSelectorGen(t *testing.T) {

cli/command/stack/kubernetes/stackclient_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	composetypes "github.com/docker/cli/cli/compose/types"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
 )
 
 func TestFromCompose(t *testing.T) {

cli/command/stack/kubernetes/warnings_test.go

@@ -6,7 +6,7 @@ import (
 	"time"
 
 	composetypes "github.com/docker/cli/cli/compose/types"
-	"github.com/gotestyourself/gotestyourself/golden"
+	"gotest.tools/golden"
 )
 
 func TestWarnings(t *testing.T) {

cli/command/stack/kubernetes/watcher_test.go

@@ -5,7 +5,7 @@ import (
 
 	apiv1beta1 "github.com/docker/cli/kubernetes/compose/v1beta1"
 	composelabels "github.com/docker/cli/kubernetes/labels"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
 	apiv1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"

cli/command/stack/list_test.go

@@ -9,9 +9,9 @@ import (
 	. "github.com/docker/cli/internal/test/builders"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/swarm"
-	"github.com/gotestyourself/gotestyourself/assert"
-	"github.com/gotestyourself/gotestyourself/golden"
 	"github.com/pkg/errors"
+	"gotest.tools/assert"
+	"gotest.tools/golden"
 )
 
 func TestListErrors(t *testing.T) {

cli/command/stack/loader/loader_test.go

@@ -6,9 +6,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	is "gotest.tools/assert/cmp"
-	"github.com/gotestyourself/gotestyourself/fs"
+	"gotest.tools/fs"
 )
 
 func TestGetConfigDetails(t *testing.T) {

cli/command/stack/ps_test.go

@@ -11,10 +11,10 @@ import (
 	. "github.com/docker/cli/internal/test/builders"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/swarm"
-	"github.com/gotestyourself/gotestyourself/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
-	"github.com/gotestyourself/gotestyourself/golden"
 	"github.com/pkg/errors"
+	"gotest.tools/assert"
+	is "gotest.tools/assert/cmp"
+	"gotest.tools/golden"
 )
 
 func TestStackPsErrors(t *testing.T) {

cli/command/stack/remove_test.go

@@ -7,8 +7,8 @@ import (
 	"testing"
 
 	"github.com/docker/cli/internal/test"
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	is "gotest.tools/assert/cmp"
 )
 
 func fakeClientForRemoveStackTest(version string) *fakeClient {

cli/command/stack/services_test.go

@@ -10,10 +10,10 @@ import (
 	. "github.com/docker/cli/internal/test/builders"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/swarm"
-	"github.com/gotestyourself/gotestyourself/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
-	"github.com/gotestyourself/gotestyourself/golden"
 	"github.com/pkg/errors"
+	"gotest.tools/assert"
+	is "gotest.tools/assert/cmp"
+	"gotest.tools/golden"
 )
 
 func TestStackServicesErrors(t *testing.T) {

cli/command/stack/swarm/deploy_bundlefile_test.go

@@ -5,8 +5,8 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/gotestyourself/gotestyourself/assert"
+	"gotest.tools/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
+	is "gotest.tools/assert/cmp"
 )
 
 func TestLoadBundlefileErrors(t *testing.T) {