From 2c4de4fb5e6b558fb775f515bac25d8ee83191ee Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Fri, 8 Jun 2018 18:24:26 +0200 Subject: [PATCH] =?UTF-8?q?Update=20tests=20to=20use=20gotest.tools=20?= =?UTF-8?q?=F0=9F=91=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Vincent Demeester --- cli/command/bundlefile/bundlefile_test.go | 4 ++-- cli/command/checkpoint/create_test.go | 4 ++-- cli/command/checkpoint/list_test.go | 6 +++--- cli/command/checkpoint/remove_test.go | 4 ++-- cli/command/cli_test.go | 8 ++++---- cli/command/config/create_test.go | 6 +++--- cli/command/config/inspect_test.go | 4 ++-- cli/command/config/ls_test.go | 6 +++--- cli/command/config/remove_test.go | 4 ++-- cli/command/container/attach_test.go | 2 +- cli/command/container/cp_test.go | 10 +++++----- cli/command/container/create_test.go | 6 +++--- cli/command/container/exec_test.go | 4 ++-- cli/command/container/list_test.go | 4 ++-- cli/command/container/logs_test.go | 4 ++-- cli/command/container/opts_test.go | 4 ++-- cli/command/container/ps_test.go | 4 ++-- cli/command/container/run_test.go | 4 ++-- cli/command/container/stats_helpers_test.go | 2 +- cli/command/container/utils_test.go | 4 ++-- cli/command/formatter/checkpoint_test.go | 2 +- cli/command/formatter/config_test.go | 4 ++-- cli/command/formatter/container_test.go | 6 +++--- cli/command/formatter/custom_test.go | 4 ++-- cli/command/formatter/diff_test.go | 4 ++-- cli/command/formatter/disk_usage_test.go | 6 +++--- cli/command/formatter/displayutils_test.go | 4 ++-- cli/command/formatter/history_test.go | 4 ++-- cli/command/formatter/image_test.go | 4 ++-- cli/command/formatter/network_test.go | 4 ++-- cli/command/formatter/node_test.go | 4 ++-- cli/command/formatter/plugin_test.go | 4 ++-- cli/command/formatter/search_test.go | 6 +++--- cli/command/formatter/secret_test.go | 4 ++-- cli/command/formatter/service_test.go | 6 +++--- cli/command/formatter/stack_test.go | 4 ++-- cli/command/formatter/stats_test.go | 4 ++-- cli/command/formatter/task_test.go | 6 +++--- cli/command/formatter/trust_test.go | 4 ++-- cli/command/formatter/volume_test.go | 4 ++-- cli/command/idresolver/idresolver_test.go | 4 ++-- cli/command/image/build/context_test.go | 4 ++-- cli/command/image/build_test.go | 6 +++--- cli/command/image/history_test.go | 6 +++--- cli/command/image/import_test.go | 4 ++-- cli/command/image/inspect_test.go | 6 +++--- cli/command/image/list_test.go | 6 +++--- cli/command/image/load_test.go | 4 ++-- cli/command/image/prune_test.go | 6 +++--- cli/command/image/pull_test.go | 6 +++--- cli/command/image/push_test.go | 2 +- cli/command/image/remove_test.go | 6 +++--- cli/command/image/save_test.go | 4 ++-- cli/command/image/tag_test.go | 4 ++-- cli/command/image/trust_test.go | 2 +- cli/command/inspect/inspector_test.go | 4 ++-- cli/command/manifest/annotate_test.go | 6 +++--- cli/command/manifest/create_test.go | 6 +++--- cli/command/manifest/inspect_test.go | 6 +++--- cli/command/manifest/push_test.go | 2 +- cli/command/network/connect_test.go | 4 ++-- cli/command/network/create_test.go | 4 ++-- cli/command/network/disconnect_test.go | 2 +- cli/command/network/list_test.go | 6 +++--- cli/command/node/demote_test.go | 2 +- cli/command/node/inspect_test.go | 4 ++-- cli/command/node/list_test.go | 6 +++--- cli/command/node/promote_test.go | 2 +- cli/command/node/ps_test.go | 4 ++-- cli/command/node/remove_test.go | 2 +- cli/command/node/update_test.go | 2 +- cli/command/plugin/create_test.go | 6 +++--- cli/command/plugin/disable_test.go | 4 ++-- cli/command/plugin/enable_test.go | 4 ++-- cli/command/plugin/remove_test.go | 4 ++-- cli/command/registry/login_test.go | 6 +++--- cli/command/registry_test.go | 4 ++-- cli/command/secret/create_test.go | 4 ++-- cli/command/secret/inspect_test.go | 4 ++-- cli/command/secret/ls_test.go | 6 +++--- cli/command/secret/remove_test.go | 4 ++-- cli/command/service/generic_resource_opts_test.go | 4 ++-- cli/command/service/inspect_test.go | 4 ++-- cli/command/service/list_test.go | 4 ++-- cli/command/service/opts_test.go | 4 ++-- cli/command/service/progress/progress_test.go | 4 ++-- cli/command/service/ps_test.go | 4 ++-- cli/command/service/rollback_test.go | 4 ++-- cli/command/service/update_test.go | 4 ++-- cli/command/stack/kubernetes/conversion_test.go | 2 +- cli/command/stack/kubernetes/services_test.go | 4 ++-- cli/command/stack/kubernetes/stackclient_test.go | 2 +- cli/command/stack/kubernetes/warnings_test.go | 2 +- cli/command/stack/kubernetes/watcher_test.go | 2 +- cli/command/stack/list_test.go | 4 ++-- cli/command/stack/loader/loader_test.go | 6 +++--- cli/command/stack/ps_test.go | 6 +++--- cli/command/stack/remove_test.go | 4 ++-- cli/command/stack/services_test.go | 6 +++--- cli/command/stack/swarm/deploy_bundlefile_test.go | 4 ++-- cli/command/stack/swarm/deploy_composefile_test.go | 2 +- cli/command/stack/swarm/deploy_test.go | 4 ++-- cli/command/stack/swarm/ps_test.go | 4 ++-- cli/command/stack/swarm/remove_test.go | 4 ++-- cli/command/stack/swarm/services_test.go | 4 ++-- cli/command/swarm/ca_test.go | 4 ++-- cli/command/swarm/init_test.go | 4 ++-- cli/command/swarm/join_test.go | 4 ++-- cli/command/swarm/join_token_test.go | 4 ++-- cli/command/swarm/leave_test.go | 4 ++-- cli/command/swarm/opts_test.go | 4 ++-- cli/command/swarm/unlock_key_test.go | 4 ++-- cli/command/swarm/unlock_test.go | 2 +- cli/command/swarm/update_test.go | 4 ++-- cli/command/system/info_test.go | 6 +++--- cli/command/system/prune_test.go | 4 ++-- cli/command/system/version_test.go | 6 +++--- cli/command/task/print_test.go | 4 ++-- cli/command/trust/helpers_test.go | 2 +- cli/command/trust/inspect_pretty_test.go | 6 +++--- cli/command/trust/inspect_test.go | 4 ++-- cli/command/trust/key_generate_test.go | 4 ++-- cli/command/trust/key_load_test.go | 6 +++--- cli/command/trust/revoke_test.go | 4 ++-- cli/command/trust/sign_test.go | 6 +++--- cli/command/trust/signer_add_test.go | 4 ++-- cli/command/trust/signer_remove_test.go | 4 ++-- cli/command/volume/create_test.go | 4 ++-- cli/command/volume/inspect_test.go | 4 ++-- cli/command/volume/list_test.go | 4 ++-- cli/command/volume/prune_test.go | 10 +++++----- cli/command/volume/remove_test.go | 2 +- cli/compose/convert/compose_test.go | 6 +++--- cli/compose/convert/service_test.go | 4 ++-- cli/compose/convert/volume_test.go | 4 ++-- cli/compose/interpolation/interpolation_test.go | 6 +++--- cli/compose/loader/loader_test.go | 4 ++-- cli/compose/loader/merge_test.go | 2 +- cli/compose/loader/types_test.go | 4 ++-- cli/compose/loader/volume_test.go | 4 ++-- cli/compose/schema/schema_test.go | 2 +- cli/compose/template/template_test.go | 4 ++-- cli/config/config_test.go | 4 ++-- cli/config/configfile/file_test.go | 4 ++-- cli/config/credentials/file_store_test.go | 4 ++-- cli/config/credentials/native_store_test.go | 4 ++-- cli/flags/common_test.go | 4 ++-- cli/manifest/store/store_test.go | 4 ++-- cli/required_test.go | 2 +- cli/trust/trust_test.go | 4 ++-- cmd/docker/docker_test.go | 4 ++-- e2e/container/attach_test.go | 2 +- e2e/container/create_test.go | 4 ++-- e2e/container/kill_test.go | 4 ++-- e2e/container/run_test.go | 10 +++++----- e2e/image/build_test.go | 6 +++--- e2e/image/pull_test.go | 6 +++--- e2e/image/push_test.go | 10 +++++----- e2e/internal/fixtures/fixtures.go | 4 ++-- e2e/plugin/trust_test.go | 8 ++++---- e2e/stack/deploy_test.go | 8 ++++---- e2e/stack/remove_test.go | 8 ++++---- e2e/system/inspect_test.go | 2 +- e2e/trust/revoke_test.go | 10 +++++----- e2e/trust/sign_test.go | 10 +++++----- internal/test/environment/testenv.go | 2 +- kubernetes/check_test.go | 4 ++-- kubernetes/labels/labels_test.go | 4 ++-- opts/duration_test.go | 4 ++-- opts/mount_test.go | 4 ++-- opts/network_test.go | 4 ++-- opts/port_test.go | 4 ++-- opts/quotedstring_test.go | 4 ++-- opts/secret_test.go | 4 ++-- service/logs/parse_logs_test.go | 4 ++-- templates/templates_test.go | 4 ++-- 176 files changed, 389 insertions(+), 389 deletions(-) diff --git a/cli/command/bundlefile/bundlefile_test.go b/cli/command/bundlefile/bundlefile_test.go index 8837aa1a27..cbaa341cd7 100644 --- a/cli/command/bundlefile/bundlefile_test.go +++ b/cli/command/bundlefile/bundlefile_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func TestLoadFileV01Success(t *testing.T) { diff --git a/cli/command/checkpoint/create_test.go b/cli/command/checkpoint/create_test.go index 59fdf9d108..70c6aad7e7 100644 --- a/cli/command/checkpoint/create_test.go +++ b/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) { diff --git a/cli/command/checkpoint/list_test.go b/cli/command/checkpoint/list_test.go index 2523bba566..986d3ee469 100644 --- a/cli/command/checkpoint/list_test.go +++ b/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) { diff --git a/cli/command/checkpoint/remove_test.go b/cli/command/checkpoint/remove_test.go index 9816b2f16c..d1a9ac4bce 100644 --- a/cli/command/checkpoint/remove_test.go +++ b/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) { diff --git a/cli/command/cli_test.go b/cli/command/cli_test.go index 1418d1b1df..26ead5ddb4 100644 --- a/cli/command/cli_test.go +++ b/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) { diff --git a/cli/command/config/create_test.go b/cli/command/config/create_test.go index 46515ca524..bb2ea946d7 100644 --- a/cli/command/config/create_test.go +++ b/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" diff --git a/cli/command/config/inspect_test.go b/cli/command/config/inspect_test.go index b714e95830..1b4f275ccb 100644 --- a/cli/command/config/inspect_test.go +++ b/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" - "github.com/gotestyourself/gotestyourself/golden" + "gotest.tools/assert" + "gotest.tools/golden" ) func TestConfigInspectErrors(t *testing.T) { diff --git a/cli/command/config/ls_test.go b/cli/command/config/ls_test.go index 3ef7a91783..d3055b4aa1 100644 --- a/cli/command/config/ls_test.go +++ b/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" - is "github.com/gotestyourself/gotestyourself/assert/cmp" - "github.com/gotestyourself/gotestyourself/golden" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" + "gotest.tools/golden" ) func TestConfigListErrors(t *testing.T) { diff --git a/cli/command/config/remove_test.go b/cli/command/config/remove_test.go index 6501210dcf..4a1980bc80 100644 --- a/cli/command/config/remove_test.go +++ b/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) { diff --git a/cli/command/container/attach_test.go b/cli/command/container/attach_test.go index e8f6da29aa..7d8d3f6edf 100644 --- a/cli/command/container/attach_test.go +++ b/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) { diff --git a/cli/command/container/cp_test.go b/cli/command/container/cp_test.go index 7d706f354c..67cdaf15a9 100644 --- a/cli/command/container/cp_test.go +++ b/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" - is "github.com/gotestyourself/gotestyourself/assert/cmp" - "github.com/gotestyourself/gotestyourself/fs" - "github.com/gotestyourself/gotestyourself/skip" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" + "gotest.tools/fs" + "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)) diff --git a/cli/command/container/create_test.go b/cli/command/container/create_test.go index a5367dfc66..1df09c7d6f 100644 --- a/cli/command/container/create_test.go +++ b/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) { diff --git a/cli/command/container/exec_test.go b/cli/command/container/exec_test.go index b4012a34c0..0c6e2614b9 100644 --- a/cli/command/container/exec_test.go +++ b/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 { diff --git a/cli/command/container/list_test.go b/cli/command/container/list_test.go index 9a064eb735..2bc1949a7f 100644 --- a/cli/command/container/list_test.go +++ b/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" - "github.com/gotestyourself/gotestyourself/golden" + "gotest.tools/assert" + "gotest.tools/golden" ) func TestContainerListErrors(t *testing.T) { diff --git a/cli/command/container/logs_test.go b/cli/command/container/logs_test.go index 4465df9a56..a618ad5e57 100644 --- a/cli/command/container/logs_test.go +++ b/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" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) var logFn = func(expectedOut string) func(string, types.ContainerLogsOptions) (io.ReadCloser, error) { diff --git a/cli/command/container/opts_test.go b/cli/command/container/opts_test.go index 5d43409662..67f0cad44d 100644 --- a/cli/command/container/opts_test.go +++ b/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) { diff --git a/cli/command/container/ps_test.go b/cli/command/container/ps_test.go index 4ca11dcb41..28853576fe 100644 --- a/cli/command/container/ps_test.go +++ b/cli/command/container/ps_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/docker/cli/opts" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func TestBuildContainerListOptions(t *testing.T) { diff --git a/cli/command/container/run_test.go b/cli/command/container/run_test.go index 94dea46805..2dcf1af240 100644 --- a/cli/command/container/run_test.go +++ b/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" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func TestRunLabel(t *testing.T) { diff --git a/cli/command/container/stats_helpers_test.go b/cli/command/container/stats_helpers_test.go index 099f425d49..a9657e2e2c 100644 --- a/cli/command/container/stats_helpers_test.go +++ b/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) { diff --git a/cli/command/container/utils_test.go b/cli/command/container/utils_test.go index de9d33a734..970549c04c 100644 --- a/cli/command/container/utils_test.go +++ b/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) { diff --git a/cli/command/formatter/checkpoint_test.go b/cli/command/formatter/checkpoint_test.go index b91748044b..9b8ac5e505 100644 --- a/cli/command/formatter/checkpoint_test.go +++ b/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) { diff --git a/cli/command/formatter/config_test.go b/cli/command/formatter/config_test.go index 3a5efb80d2..7cd310c9ec 100644 --- a/cli/command/formatter/config_test.go +++ b/cli/command/formatter/config_test.go @@ -6,8 +6,8 @@ import ( "time" "github.com/docker/docker/api/types/swarm" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func TestConfigContextFormatWrite(t *testing.T) { diff --git a/cli/command/formatter/container_test.go b/cli/command/formatter/container_test.go index 8b1893f8d5..cafb9abdac 100644 --- a/cli/command/formatter/container_test.go +++ b/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" - is "github.com/gotestyourself/gotestyourself/assert/cmp" - "github.com/gotestyourself/gotestyourself/golden" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" + "gotest.tools/golden" ) func TestContainerPsContext(t *testing.T) { diff --git a/cli/command/formatter/custom_test.go b/cli/command/formatter/custom_test.go index 02df8d9f85..6a4bfec784 100644 --- a/cli/command/formatter/custom_test.go +++ b/cli/command/formatter/custom_test.go @@ -4,8 +4,8 @@ import ( "strings" "testing" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func compareMultipleValues(t *testing.T, value, expected string) { diff --git a/cli/command/formatter/diff_test.go b/cli/command/formatter/diff_test.go index dd104aecc7..aad5945057 100644 --- a/cli/command/formatter/diff_test.go +++ b/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" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func TestDiffContextFormatWrite(t *testing.T) { diff --git a/cli/command/formatter/disk_usage_test.go b/cli/command/formatter/disk_usage_test.go index dc206dea4c..6196af5986 100644 --- a/cli/command/formatter/disk_usage_test.go +++ b/cli/command/formatter/disk_usage_test.go @@ -4,9 +4,9 @@ import ( "bytes" "testing" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" - "github.com/gotestyourself/gotestyourself/golden" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" + "gotest.tools/golden" ) func TestDiskUsageContextFormatWrite(t *testing.T) { diff --git a/cli/command/formatter/displayutils_test.go b/cli/command/formatter/displayutils_test.go index 0182d70759..db60610bb2 100644 --- a/cli/command/formatter/displayutils_test.go +++ b/cli/command/formatter/displayutils_test.go @@ -3,8 +3,8 @@ package formatter import ( "testing" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func TestEllipsis(t *testing.T) { diff --git a/cli/command/formatter/history_test.go b/cli/command/formatter/history_test.go index 77423a8010..7dfc146be3 100644 --- a/cli/command/formatter/history_test.go +++ b/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" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) type historyCase struct { diff --git a/cli/command/formatter/image_test.go b/cli/command/formatter/image_test.go index 26488f335a..7efad0a758 100644 --- a/cli/command/formatter/image_test.go +++ b/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" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func TestImageContext(t *testing.T) { diff --git a/cli/command/formatter/network_test.go b/cli/command/formatter/network_test.go index 79b5880543..6831926e46 100644 --- a/cli/command/formatter/network_test.go +++ b/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" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func TestNetworkContext(t *testing.T) { diff --git a/cli/command/formatter/node_test.go b/cli/command/formatter/node_test.go index 3fa9ceb785..cf9ccbde82 100644 --- a/cli/command/formatter/node_test.go +++ b/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" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func TestNodeContext(t *testing.T) { diff --git a/cli/command/formatter/plugin_test.go b/cli/command/formatter/plugin_test.go index ebe615dd13..b8551589e1 100644 --- a/cli/command/formatter/plugin_test.go +++ b/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" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func TestPluginContext(t *testing.T) { diff --git a/cli/command/formatter/search_test.go b/cli/command/formatter/search_test.go index e5a2d1a91a..2e5bac0fc8 100644 --- a/cli/command/formatter/search_test.go +++ b/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" - is "github.com/gotestyourself/gotestyourself/assert/cmp" - "github.com/gotestyourself/gotestyourself/golden" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" + "gotest.tools/golden" ) func TestSearchContext(t *testing.T) { diff --git a/cli/command/formatter/secret_test.go b/cli/command/formatter/secret_test.go index e62793d3b1..31119786ff 100644 --- a/cli/command/formatter/secret_test.go +++ b/cli/command/formatter/secret_test.go @@ -6,8 +6,8 @@ import ( "time" "github.com/docker/docker/api/types/swarm" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func TestSecretContextFormatWrite(t *testing.T) { diff --git a/cli/command/formatter/service_test.go b/cli/command/formatter/service_test.go index 11c00c4b01..243899d1b9 100644 --- a/cli/command/formatter/service_test.go +++ b/cli/command/formatter/service_test.go @@ -8,9 +8,9 @@ import ( "testing" "github.com/docker/docker/api/types/swarm" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" - "github.com/gotestyourself/gotestyourself/golden" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" + "gotest.tools/golden" ) func TestServiceContextWrite(t *testing.T) { diff --git a/cli/command/formatter/stack_test.go b/cli/command/formatter/stack_test.go index 27ca17e5a6..44a08406c3 100644 --- a/cli/command/formatter/stack_test.go +++ b/cli/command/formatter/stack_test.go @@ -4,8 +4,8 @@ import ( "bytes" "testing" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func TestStackContextWrite(t *testing.T) { diff --git a/cli/command/formatter/stats_test.go b/cli/command/formatter/stats_test.go index 6c88fe8771..3325dd9fba 100644 --- a/cli/command/formatter/stats_test.go +++ b/cli/command/formatter/stats_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/docker/docker/pkg/stringid" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func TestContainerStatsContext(t *testing.T) { diff --git a/cli/command/formatter/task_test.go b/cli/command/formatter/task_test.go index 9dc8a18bb8..84bdbfeb97 100644 --- a/cli/command/formatter/task_test.go +++ b/cli/command/formatter/task_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/docker/docker/api/types/swarm" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" - "github.com/gotestyourself/gotestyourself/golden" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" + "gotest.tools/golden" ) func TestTaskContextWrite(t *testing.T) { diff --git a/cli/command/formatter/trust_test.go b/cli/command/formatter/trust_test.go index 4f97996a7c..7e1d894fbd 100644 --- a/cli/command/formatter/trust_test.go +++ b/cli/command/formatter/trust_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/docker/docker/pkg/stringid" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func TestTrustTag(t *testing.T) { diff --git a/cli/command/formatter/volume_test.go b/cli/command/formatter/volume_test.go index 425aaed12d..43c6061d6e 100644 --- a/cli/command/formatter/volume_test.go +++ b/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" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func TestVolumeContext(t *testing.T) { diff --git a/cli/command/idresolver/idresolver_test.go b/cli/command/idresolver/idresolver_test.go index c4ab3fecd4..f667b10641 100644 --- a/cli/command/idresolver/idresolver_test.go +++ b/cli/command/idresolver/idresolver_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/docker/docker/api/types/swarm" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" // Import builders to get the builder function as package function "context" diff --git a/cli/command/image/build/context_test.go b/cli/command/image/build/context_test.go index 493eda014c..d74add88b2 100644 --- a/cli/command/image/build/context_test.go +++ b/cli/command/image/build/context_test.go @@ -12,8 +12,8 @@ import ( "testing" "github.com/docker/docker/pkg/archive" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) const dockerfileContents = "FROM busybox" diff --git a/cli/command/image/build_test.go b/cli/command/image/build_test.go index fb8764c64d..adcacd49f8 100644 --- a/cli/command/image/build_test.go +++ b/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" - "github.com/gotestyourself/gotestyourself/fs" - "github.com/gotestyourself/gotestyourself/skip" + "gotest.tools/assert" + "gotest.tools/fs" + "gotest.tools/skip" ) func TestRunBuildDockerfileFromStdinWithCompress(t *testing.T) { diff --git a/cli/command/image/history_test.go b/cli/command/image/history_test.go index b94e4ce8c9..ad2beb9a83 100644 --- a/cli/command/image/history_test.go +++ b/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) { diff --git a/cli/command/image/import_test.go b/cli/command/image/import_test.go index 2eefe72479..9e2fad61fa 100644 --- a/cli/command/image/import_test.go +++ b/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) { diff --git a/cli/command/image/inspect_test.go b/cli/command/image/inspect_test.go index 4bf0547416..d881ae0aa3 100644 --- a/cli/command/image/inspect_test.go +++ b/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" - is "github.com/gotestyourself/gotestyourself/assert/cmp" - "github.com/gotestyourself/gotestyourself/golden" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" + "gotest.tools/golden" ) func TestNewInspectCommandErrors(t *testing.T) { diff --git a/cli/command/image/list_test.go b/cli/command/image/list_test.go index f4ce847262..81394a797b 100644 --- a/cli/command/image/list_test.go +++ b/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) { diff --git a/cli/command/image/load_test.go b/cli/command/image/load_test.go index d3ec89e36c..5fe4344f6d 100644 --- a/cli/command/image/load_test.go +++ b/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) { diff --git a/cli/command/image/prune_test.go b/cli/command/image/prune_test.go index 9c03d83d72..ca46bbf6bb 100644 --- a/cli/command/image/prune_test.go +++ b/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) { diff --git a/cli/command/image/pull_test.go b/cli/command/image/pull_test.go index df639232fa..c5ae75608a 100644 --- a/cli/command/image/pull_test.go +++ b/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" - is "github.com/gotestyourself/gotestyourself/assert/cmp" - "github.com/gotestyourself/gotestyourself/golden" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" + "gotest.tools/golden" ) func TestNewPullCommandErrors(t *testing.T) { diff --git a/cli/command/image/push_test.go b/cli/command/image/push_test.go index 10d5cb3a81..75798aaaf1 100644 --- a/cli/command/image/push_test.go +++ b/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) { diff --git a/cli/command/image/remove_test.go b/cli/command/image/remove_test.go index 2c0cc9b0ac..6db2e03187 100644 --- a/cli/command/image/remove_test.go +++ b/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 { diff --git a/cli/command/image/save_test.go b/cli/command/image/save_test.go index b87be3c8af..d051e8cb5c 100644 --- a/cli/command/image/save_test.go +++ b/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) { diff --git a/cli/command/image/tag_test.go b/cli/command/image/tag_test.go index 0319cb0522..9c43f3fe77 100644 --- a/cli/command/image/tag_test.go +++ b/cli/command/image/tag_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/docker/cli/internal/test" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func TestCliNewTagCommandErrors(t *testing.T) { diff --git a/cli/command/image/trust_test.go b/cli/command/image/trust_test.go index 946caf444f..97585a7299 100644 --- a/cli/command/image/trust_test.go +++ b/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() { diff --git a/cli/command/inspect/inspector_test.go b/cli/command/inspect/inspector_test.go index 8eb818ee7d..f4df36848d 100644 --- a/cli/command/inspect/inspector_test.go +++ b/cli/command/inspect/inspector_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/docker/cli/templates" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) type testElement struct { diff --git a/cli/command/manifest/annotate_test.go b/cli/command/manifest/annotate_test.go index ab6f3bbf3a..e5cce8f629 100644 --- a/cli/command/manifest/annotate_test.go +++ b/cli/command/manifest/annotate_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/docker/cli/internal/test" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" - "github.com/gotestyourself/gotestyourself/golden" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" + "gotest.tools/golden" ) func TestManifestAnnotateError(t *testing.T) { diff --git a/cli/command/manifest/create_test.go b/cli/command/manifest/create_test.go index 9082c56ed3..fbf0ae7b8f 100644 --- a/cli/command/manifest/create_test.go +++ b/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) { diff --git a/cli/command/manifest/inspect_test.go b/cli/command/manifest/inspect_test.go index 06192fb38d..4c43796808 100644 --- a/cli/command/manifest/inspect_test.go +++ b/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()) { diff --git a/cli/command/manifest/push_test.go b/cli/command/manifest/push_test.go index a09069606b..3a2e9b8a99 100644 --- a/cli/command/manifest/push_test.go +++ b/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 { diff --git a/cli/command/network/connect_test.go b/cli/command/network/connect_test.go index 59e35ab1ae..2c1d040147 100644 --- a/cli/command/network/connect_test.go +++ b/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) { diff --git a/cli/command/network/create_test.go b/cli/command/network/create_test.go index 3a0fa0fba9..6bfa7b65bc 100644 --- a/cli/command/network/create_test.go +++ b/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) { diff --git a/cli/command/network/disconnect_test.go b/cli/command/network/disconnect_test.go index 5f15e61877..9a55257051 100644 --- a/cli/command/network/disconnect_test.go +++ b/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) { diff --git a/cli/command/network/list_test.go b/cli/command/network/list_test.go index cdffcc6459..1106315f7e 100644 --- a/cli/command/network/list_test.go +++ b/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) { diff --git a/cli/command/node/demote_test.go b/cli/command/node/demote_test.go index 5bbc7dae36..3f18d63d41 100644 --- a/cli/command/node/demote_test.go +++ b/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" ) diff --git a/cli/command/node/inspect_test.go b/cli/command/node/inspect_test.go index 73f0a9e872..de343b0f49 100644 --- a/cli/command/node/inspect_test.go +++ b/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" - "github.com/gotestyourself/gotestyourself/golden" + "gotest.tools/assert" + "gotest.tools/golden" ) func TestNodeInspectErrors(t *testing.T) { diff --git a/cli/command/node/list_test.go b/cli/command/node/list_test.go index 2d56af8377..5dc11c961a 100644 --- a/cli/command/node/list_test.go +++ b/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" ) diff --git a/cli/command/node/promote_test.go b/cli/command/node/promote_test.go index 5d5c105dfe..c6b5342320 100644 --- a/cli/command/node/promote_test.go +++ b/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" ) diff --git a/cli/command/node/ps_test.go b/cli/command/node/ps_test.go index 2a8533fb08..ae5ed6169f 100644 --- a/cli/command/node/ps_test.go +++ b/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" - "github.com/gotestyourself/gotestyourself/golden" + "gotest.tools/assert" + "gotest.tools/golden" ) func TestNodePsErrors(t *testing.T) { diff --git a/cli/command/node/remove_test.go b/cli/command/node/remove_test.go index 17ebb46f75..8ae01c7b2f 100644 --- a/cli/command/node/remove_test.go +++ b/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) { diff --git a/cli/command/node/update_test.go b/cli/command/node/update_test.go index 6d3f6f0bd4..8b6ae807da 100644 --- a/cli/command/node/update_test.go +++ b/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" ) diff --git a/cli/command/plugin/create_test.go b/cli/command/plugin/create_test.go index 41191cab35..bef002c07a 100644 --- a/cli/command/plugin/create_test.go +++ b/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" - is "github.com/gotestyourself/gotestyourself/assert/cmp" - "github.com/gotestyourself/gotestyourself/fs" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" + "gotest.tools/fs" ) func TestCreateErrors(t *testing.T) { diff --git a/cli/command/plugin/disable_test.go b/cli/command/plugin/disable_test.go index 592e0e4951..c9292965f7 100644 --- a/cli/command/plugin/disable_test.go +++ b/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" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func TestPluginDisableErrors(t *testing.T) { diff --git a/cli/command/plugin/enable_test.go b/cli/command/plugin/enable_test.go index 42ce53576a..933ff5de1c 100644 --- a/cli/command/plugin/enable_test.go +++ b/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" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func TestPluginEnableErrors(t *testing.T) { diff --git a/cli/command/plugin/remove_test.go b/cli/command/plugin/remove_test.go index 813c7615f6..4cfec43341 100644 --- a/cli/command/plugin/remove_test.go +++ b/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" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func TestRemoveErrors(t *testing.T) { diff --git a/cli/command/registry/login_test.go b/cli/command/registry/login_test.go index 9eb3f682c1..7e77494186 100644 --- a/cli/command/registry/login_test.go +++ b/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" - is "github.com/gotestyourself/gotestyourself/assert/cmp" - "github.com/gotestyourself/gotestyourself/fs" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" + "gotest.tools/fs" ) const userErr = "userunknownError" diff --git a/cli/command/registry_test.go b/cli/command/registry_test.go index f6be9b316b..8c9f5835f6 100644 --- a/cli/command/registry_test.go +++ b/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" diff --git a/cli/command/secret/create_test.go b/cli/command/secret/create_test.go index 7a9492ca0f..eb9c089861 100644 --- a/cli/command/secret/create_test.go +++ b/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" diff --git a/cli/command/secret/inspect_test.go b/cli/command/secret/inspect_test.go index b23d78beb9..67addaeadf 100644 --- a/cli/command/secret/inspect_test.go +++ b/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" - "github.com/gotestyourself/gotestyourself/golden" + "gotest.tools/assert" + "gotest.tools/golden" ) func TestSecretInspectErrors(t *testing.T) { diff --git a/cli/command/secret/ls_test.go b/cli/command/secret/ls_test.go index 371218926c..e1417115ce 100644 --- a/cli/command/secret/ls_test.go +++ b/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" - is "github.com/gotestyourself/gotestyourself/assert/cmp" - "github.com/gotestyourself/gotestyourself/golden" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" + "gotest.tools/golden" ) func TestSecretListErrors(t *testing.T) { diff --git a/cli/command/secret/remove_test.go b/cli/command/secret/remove_test.go index 349f47b387..d2fc8ad093 100644 --- a/cli/command/secret/remove_test.go +++ b/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) { diff --git a/cli/command/service/generic_resource_opts_test.go b/cli/command/service/generic_resource_opts_test.go index ffc7f4ca64..c750f1dc88 100644 --- a/cli/command/service/generic_resource_opts_test.go +++ b/cli/command/service/generic_resource_opts_test.go @@ -3,8 +3,8 @@ package service import ( "testing" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func TestValidateSingleGenericResource(t *testing.T) { diff --git a/cli/command/service/inspect_test.go b/cli/command/service/inspect_test.go index 41736f8894..c27a9a8850 100644 --- a/cli/command/service/inspect_test.go +++ b/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" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func formatServiceInspect(t *testing.T, format formatter.Format, now time.Time) string { diff --git a/cli/command/service/list_test.go b/cli/command/service/list_test.go index c84dd587fd..e52e7e03c2 100644 --- a/cli/command/service/list_test.go +++ b/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" - "github.com/gotestyourself/gotestyourself/golden" + "gotest.tools/assert" + "gotest.tools/golden" ) func TestServiceListOrder(t *testing.T) { diff --git a/cli/command/service/opts_test.go b/cli/command/service/opts_test.go index 0cacffec93..344893f552 100644 --- a/cli/command/service/opts_test.go +++ b/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" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func TestMemBytesString(t *testing.T) { diff --git a/cli/command/service/progress/progress_test.go b/cli/command/service/progress/progress_test.go index 198d29acf6..2a386d64f5 100644 --- a/cli/command/service/progress/progress_test.go +++ b/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" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) type mockProgress struct { diff --git a/cli/command/service/ps_test.go b/cli/command/service/ps_test.go index 80ee61e9f7..6459cfcc3b 100644 --- a/cli/command/service/ps_test.go +++ b/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" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func TestCreateFilter(t *testing.T) { diff --git a/cli/command/service/rollback_test.go b/cli/command/service/rollback_test.go index 70795af945..e61d1c20bb 100644 --- a/cli/command/service/rollback_test.go +++ b/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" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func TestRollback(t *testing.T) { diff --git a/cli/command/service/update_test.go b/cli/command/service/update_test.go index 94ccb4963f..fa761ba08f 100644 --- a/cli/command/service/update_test.go +++ b/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" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func TestUpdateServiceArgs(t *testing.T) { diff --git a/cli/command/stack/kubernetes/conversion_test.go b/cli/command/stack/kubernetes/conversion_test.go index 866557b3a7..213e9ea60e 100644 --- a/cli/command/stack/kubernetes/conversion_test.go +++ b/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" diff --git a/cli/command/stack/kubernetes/services_test.go b/cli/command/stack/kubernetes/services_test.go index 89cb9b7e4e..5603eeda15 100644 --- a/cli/command/stack/kubernetes/services_test.go +++ b/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" - "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + "gotest.tools/assert/cmp" ) func TestServiceFiltersLabelSelectorGen(t *testing.T) { diff --git a/cli/command/stack/kubernetes/stackclient_test.go b/cli/command/stack/kubernetes/stackclient_test.go index b82e6b13ef..8757f1c466 100644 --- a/cli/command/stack/kubernetes/stackclient_test.go +++ b/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) { diff --git a/cli/command/stack/kubernetes/warnings_test.go b/cli/command/stack/kubernetes/warnings_test.go index b1d911e094..bdb7bf9de7 100644 --- a/cli/command/stack/kubernetes/warnings_test.go +++ b/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) { diff --git a/cli/command/stack/kubernetes/watcher_test.go b/cli/command/stack/kubernetes/watcher_test.go index 80c7b5fd8d..84e51ea3b3 100644 --- a/cli/command/stack/kubernetes/watcher_test.go +++ b/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" diff --git a/cli/command/stack/list_test.go b/cli/command/stack/list_test.go index c3d827ccda..2e7ad4df12 100644 --- a/cli/command/stack/list_test.go +++ b/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) { diff --git a/cli/command/stack/loader/loader_test.go b/cli/command/stack/loader/loader_test.go index c027371dda..de524cc527 100644 --- a/cli/command/stack/loader/loader_test.go +++ b/cli/command/stack/loader/loader_test.go @@ -6,9 +6,9 @@ import ( "strings" "testing" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" - "github.com/gotestyourself/gotestyourself/fs" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" + "gotest.tools/fs" ) func TestGetConfigDetails(t *testing.T) { diff --git a/cli/command/stack/ps_test.go b/cli/command/stack/ps_test.go index b3cce8d58a..da769d8659 100644 --- a/cli/command/stack/ps_test.go +++ b/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) { diff --git a/cli/command/stack/remove_test.go b/cli/command/stack/remove_test.go index 5f27a9b32a..196ebdc67a 100644 --- a/cli/command/stack/remove_test.go +++ b/cli/command/stack/remove_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/docker/cli/internal/test" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func fakeClientForRemoveStackTest(version string) *fakeClient { diff --git a/cli/command/stack/services_test.go b/cli/command/stack/services_test.go index 195d65c346..2acb91ca73 100644 --- a/cli/command/stack/services_test.go +++ b/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) { diff --git a/cli/command/stack/swarm/deploy_bundlefile_test.go b/cli/command/stack/swarm/deploy_bundlefile_test.go index 4e66caabed..485271cbc9 100644 --- a/cli/command/stack/swarm/deploy_bundlefile_test.go +++ b/cli/command/stack/swarm/deploy_bundlefile_test.go @@ -5,8 +5,8 @@ import ( "path/filepath" "testing" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func TestLoadBundlefileErrors(t *testing.T) { diff --git a/cli/command/stack/swarm/deploy_composefile_test.go b/cli/command/stack/swarm/deploy_composefile_test.go index a3278b8479..065a4f2938 100644 --- a/cli/command/stack/swarm/deploy_composefile_test.go +++ b/cli/command/stack/swarm/deploy_composefile_test.go @@ -6,8 +6,8 @@ import ( "github.com/docker/cli/internal/test/network" "github.com/docker/docker/api/types" - "github.com/gotestyourself/gotestyourself/assert" "github.com/pkg/errors" + "gotest.tools/assert" ) type notFound struct { diff --git a/cli/command/stack/swarm/deploy_test.go b/cli/command/stack/swarm/deploy_test.go index 690ab48444..64aafec382 100644 --- a/cli/command/stack/swarm/deploy_test.go +++ b/cli/command/stack/swarm/deploy_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/swarm" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func TestPruneServices(t *testing.T) { diff --git a/cli/command/stack/swarm/ps_test.go b/cli/command/stack/swarm/ps_test.go index 1989f140bd..33401da655 100644 --- a/cli/command/stack/swarm/ps_test.go +++ b/cli/command/stack/swarm/ps_test.go @@ -5,8 +5,8 @@ import ( "github.com/docker/cli/cli/command/stack/options" "github.com/docker/cli/internal/test" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func TestRunPSWithEmptyName(t *testing.T) { diff --git a/cli/command/stack/swarm/remove_test.go b/cli/command/stack/swarm/remove_test.go index bfc43e742e..3d30b288ac 100644 --- a/cli/command/stack/swarm/remove_test.go +++ b/cli/command/stack/swarm/remove_test.go @@ -5,8 +5,8 @@ import ( "github.com/docker/cli/cli/command/stack/options" "github.com/docker/cli/internal/test" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func TestRunRemoveWithEmptyName(t *testing.T) { diff --git a/cli/command/stack/swarm/services_test.go b/cli/command/stack/swarm/services_test.go index dbd56222d5..9e3ca47f3a 100644 --- a/cli/command/stack/swarm/services_test.go +++ b/cli/command/stack/swarm/services_test.go @@ -5,8 +5,8 @@ import ( "github.com/docker/cli/cli/command/stack/options" "github.com/docker/cli/internal/test" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func TestRunServicesWithEmptyName(t *testing.T) { diff --git a/cli/command/swarm/ca_test.go b/cli/command/swarm/ca_test.go index d11739ec37..499090477e 100644 --- a/cli/command/swarm/ca_test.go +++ b/cli/command/swarm/ca_test.go @@ -9,8 +9,8 @@ import ( "github.com/docker/cli/internal/test" "github.com/docker/docker/api/types/swarm" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func swarmSpecWithFullCAConfig() *swarm.Spec { diff --git a/cli/command/swarm/init_test.go b/cli/command/swarm/init_test.go index 22712726ca..735cc8da4d 100644 --- a/cli/command/swarm/init_test.go +++ b/cli/command/swarm/init_test.go @@ -8,9 +8,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" - "github.com/gotestyourself/gotestyourself/golden" "github.com/pkg/errors" + "gotest.tools/assert" + "gotest.tools/golden" ) func TestSwarmInitErrorOnAPIFailure(t *testing.T) { diff --git a/cli/command/swarm/join_test.go b/cli/command/swarm/join_test.go index 7817df1440..e70d448db0 100644 --- a/cli/command/swarm/join_test.go +++ b/cli/command/swarm/join_test.go @@ -8,9 +8,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" ) func TestSwarmJoinErrors(t *testing.T) { diff --git a/cli/command/swarm/join_token_test.go b/cli/command/swarm/join_token_test.go index ca042671b2..1bd7ba2508 100644 --- a/cli/command/swarm/join_token_test.go +++ b/cli/command/swarm/join_token_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" - "github.com/gotestyourself/gotestyourself/golden" + "gotest.tools/assert" + "gotest.tools/golden" ) func TestSwarmJoinTokenErrors(t *testing.T) { diff --git a/cli/command/swarm/leave_test.go b/cli/command/swarm/leave_test.go index 07eac2c4da..91ee6e248e 100644 --- a/cli/command/swarm/leave_test.go +++ b/cli/command/swarm/leave_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 TestSwarmLeaveErrors(t *testing.T) { diff --git a/cli/command/swarm/opts_test.go b/cli/command/swarm/opts_test.go index 6aa12b89c4..6382d2a02a 100644 --- a/cli/command/swarm/opts_test.go +++ b/cli/command/swarm/opts_test.go @@ -3,8 +3,8 @@ package swarm import ( "testing" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func TestNodeAddrOptionSetHostAndPort(t *testing.T) { diff --git a/cli/command/swarm/unlock_key_test.go b/cli/command/swarm/unlock_key_test.go index aaade6fe9c..d28921a141 100644 --- a/cli/command/swarm/unlock_key_test.go +++ b/cli/command/swarm/unlock_key_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" - "github.com/gotestyourself/gotestyourself/golden" + "gotest.tools/assert" + "gotest.tools/golden" ) func TestSwarmUnlockKeyErrors(t *testing.T) { diff --git a/cli/command/swarm/unlock_test.go b/cli/command/swarm/unlock_test.go index eb481d13ca..8eb2ecd4f0 100644 --- a/cli/command/swarm/unlock_test.go +++ b/cli/command/swarm/unlock_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/swarm" - "github.com/gotestyourself/gotestyourself/assert" "github.com/pkg/errors" + "gotest.tools/assert" ) func TestSwarmUnlockErrors(t *testing.T) { diff --git a/cli/command/swarm/update_test.go b/cli/command/swarm/update_test.go index 60e44ddfe0..256c9de6d0 100644 --- a/cli/command/swarm/update_test.go +++ b/cli/command/swarm/update_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" - "github.com/gotestyourself/gotestyourself/golden" + "gotest.tools/assert" + "gotest.tools/golden" ) func TestSwarmUpdateErrors(t *testing.T) { diff --git a/cli/command/system/info_test.go b/cli/command/system/info_test.go index 7e2dd6bff8..600e79ac3e 100644 --- a/cli/command/system/info_test.go +++ b/cli/command/system/info_test.go @@ -10,9 +10,9 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/registry" "github.com/docker/docker/api/types/swarm" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" - "github.com/gotestyourself/gotestyourself/golden" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" + "gotest.tools/golden" ) // helper function that base64 decodes a string and ignores the error diff --git a/cli/command/system/prune_test.go b/cli/command/system/prune_test.go index b763c480ab..c0b5cafd3d 100644 --- a/cli/command/system/prune_test.go +++ b/cli/command/system/prune_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/docker/cli/internal/test" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func TestPrunePromptPre131DoesNotIncludeBuildCache(t *testing.T) { diff --git a/cli/command/system/version_test.go b/cli/command/system/version_test.go index 81fc5b91af..fdf870d0f5 100644 --- a/cli/command/system/version_test.go +++ b/cli/command/system/version_test.go @@ -6,9 +6,9 @@ import ( "strings" "testing" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" - "github.com/gotestyourself/gotestyourself/golden" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" + "gotest.tools/golden" "github.com/docker/cli/internal/test" "github.com/docker/docker/api" diff --git a/cli/command/task/print_test.go b/cli/command/task/print_test.go index aa1cfed370..6fa6e58653 100644 --- a/cli/command/task/print_test.go +++ b/cli/command/task/print_test.go @@ -12,8 +12,8 @@ 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" + "gotest.tools/assert" + "gotest.tools/golden" ) func TestTaskPrintWithQuietOption(t *testing.T) { diff --git a/cli/command/trust/helpers_test.go b/cli/command/trust/helpers_test.go index 216ae5ce9d..fab61214c4 100644 --- a/cli/command/trust/helpers_test.go +++ b/cli/command/trust/helpers_test.go @@ -5,10 +5,10 @@ import ( "os" "testing" - "github.com/gotestyourself/gotestyourself/assert" "github.com/theupdateframework/notary/client" "github.com/theupdateframework/notary/passphrase" "github.com/theupdateframework/notary/trustpinning" + "gotest.tools/assert" ) func TestGetOrGenerateNotaryKeyAndInitRepo(t *testing.T) { diff --git a/cli/command/trust/inspect_pretty_test.go b/cli/command/trust/inspect_pretty_test.go index 5db01666b7..8c5141b331 100644 --- a/cli/command/trust/inspect_pretty_test.go +++ b/cli/command/trust/inspect_pretty_test.go @@ -9,12 +9,12 @@ import ( "github.com/docker/cli/internal/test" notaryfake "github.com/docker/cli/internal/test/notary" dockerClient "github.com/docker/docker/client" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" - "github.com/gotestyourself/gotestyourself/golden" "github.com/theupdateframework/notary" "github.com/theupdateframework/notary/client" "github.com/theupdateframework/notary/tuf/data" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" + "gotest.tools/golden" ) // TODO(n4ss): remove common tests with the regular inspect command diff --git a/cli/command/trust/inspect_test.go b/cli/command/trust/inspect_test.go index 6e0e402bbd..3cf6e0ebcb 100644 --- a/cli/command/trust/inspect_test.go +++ b/cli/command/trust/inspect_test.go @@ -6,8 +6,8 @@ import ( "github.com/docker/cli/internal/test" "github.com/docker/cli/internal/test/notary" - "github.com/gotestyourself/gotestyourself/assert" - "github.com/gotestyourself/gotestyourself/golden" + "gotest.tools/assert" + "gotest.tools/golden" ) func TestTrustInspectCommandErrors(t *testing.T) { diff --git a/cli/command/trust/key_generate_test.go b/cli/command/trust/key_generate_test.go index 6e26f98d1f..b4c798d87d 100644 --- a/cli/command/trust/key_generate_test.go +++ b/cli/command/trust/key_generate_test.go @@ -10,12 +10,12 @@ import ( "github.com/docker/cli/cli/config" "github.com/docker/cli/internal/test" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" "github.com/theupdateframework/notary" "github.com/theupdateframework/notary/passphrase" "github.com/theupdateframework/notary/trustmanager" tufutils "github.com/theupdateframework/notary/tuf/utils" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func TestTrustKeyGenerateErrors(t *testing.T) { diff --git a/cli/command/trust/key_load_test.go b/cli/command/trust/key_load_test.go index c4da320a59..e0e35aab9b 100644 --- a/cli/command/trust/key_load_test.go +++ b/cli/command/trust/key_load_test.go @@ -11,14 +11,14 @@ import ( "github.com/docker/cli/cli/config" "github.com/docker/cli/internal/test" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" - "github.com/gotestyourself/gotestyourself/skip" "github.com/theupdateframework/notary" "github.com/theupdateframework/notary/passphrase" "github.com/theupdateframework/notary/storage" "github.com/theupdateframework/notary/trustmanager" tufutils "github.com/theupdateframework/notary/tuf/utils" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" + "gotest.tools/skip" ) func TestTrustKeyLoadErrors(t *testing.T) { diff --git a/cli/command/trust/revoke_test.go b/cli/command/trust/revoke_test.go index 289fd3f173..b0a43876ce 100644 --- a/cli/command/trust/revoke_test.go +++ b/cli/command/trust/revoke_test.go @@ -7,11 +7,11 @@ import ( "github.com/docker/cli/internal/test" "github.com/docker/cli/internal/test/notary" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" "github.com/theupdateframework/notary/client" "github.com/theupdateframework/notary/passphrase" "github.com/theupdateframework/notary/trustpinning" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func TestTrustRevokeCommandErrors(t *testing.T) { diff --git a/cli/command/trust/sign_test.go b/cli/command/trust/sign_test.go index e441f7bef2..5a7b6b5f37 100644 --- a/cli/command/trust/sign_test.go +++ b/cli/command/trust/sign_test.go @@ -12,15 +12,15 @@ import ( "github.com/docker/cli/cli/trust" "github.com/docker/cli/internal/test" notaryfake "github.com/docker/cli/internal/test/notary" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" - "github.com/gotestyourself/gotestyourself/skip" "github.com/theupdateframework/notary" "github.com/theupdateframework/notary/client" "github.com/theupdateframework/notary/client/changelist" "github.com/theupdateframework/notary/passphrase" "github.com/theupdateframework/notary/trustpinning" "github.com/theupdateframework/notary/tuf/data" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" + "gotest.tools/skip" ) const passwd = "password" diff --git a/cli/command/trust/signer_add_test.go b/cli/command/trust/signer_add_test.go index 643a31b75a..64121e2958 100644 --- a/cli/command/trust/signer_add_test.go +++ b/cli/command/trust/signer_add_test.go @@ -11,9 +11,9 @@ import ( "github.com/docker/cli/cli/config" "github.com/docker/cli/internal/test" notaryfake "github.com/docker/cli/internal/test/notary" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" "github.com/theupdateframework/notary" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func TestTrustSignerAddErrors(t *testing.T) { diff --git a/cli/command/trust/signer_remove_test.go b/cli/command/trust/signer_remove_test.go index 4f11634be2..f86bd84018 100644 --- a/cli/command/trust/signer_remove_test.go +++ b/cli/command/trust/signer_remove_test.go @@ -6,10 +6,10 @@ import ( "github.com/docker/cli/internal/test" notaryfake "github.com/docker/cli/internal/test/notary" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" "github.com/theupdateframework/notary/client" "github.com/theupdateframework/notary/tuf/data" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func TestTrustSignerRemoveErrors(t *testing.T) { diff --git a/cli/command/volume/create_test.go b/cli/command/volume/create_test.go index 40462a8c67..a0646ed113 100644 --- a/cli/command/volume/create_test.go +++ b/cli/command/volume/create_test.go @@ -9,9 +9,9 @@ import ( "github.com/docker/cli/internal/test" "github.com/docker/docker/api/types" volumetypes "github.com/docker/docker/api/types/volume" - "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 TestVolumeCreateErrors(t *testing.T) { diff --git a/cli/command/volume/inspect_test.go b/cli/command/volume/inspect_test.go index c827b7281c..759042a512 100644 --- a/cli/command/volume/inspect_test.go +++ b/cli/command/volume/inspect_test.go @@ -10,8 +10,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" - "github.com/gotestyourself/gotestyourself/golden" + "gotest.tools/assert" + "gotest.tools/golden" ) func TestVolumeInspectErrors(t *testing.T) { diff --git a/cli/command/volume/list_test.go b/cli/command/volume/list_test.go index ac140e3585..62d7d95664 100644 --- a/cli/command/volume/list_test.go +++ b/cli/command/volume/list_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" - "github.com/gotestyourself/gotestyourself/golden" + "gotest.tools/assert" + "gotest.tools/golden" ) func TestVolumeListErrors(t *testing.T) { diff --git a/cli/command/volume/prune_test.go b/cli/command/volume/prune_test.go index 0d75d3b75d..79d4d52e32 100644 --- a/cli/command/volume/prune_test.go +++ b/cli/command/volume/prune_test.go @@ -11,10 +11,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" - "github.com/gotestyourself/gotestyourself/golden" - "github.com/gotestyourself/gotestyourself/skip" "github.com/pkg/errors" + "gotest.tools/assert" + "gotest.tools/golden" + "gotest.tools/skip" ) func TestVolumePruneErrors(t *testing.T) { @@ -79,7 +79,7 @@ func TestVolumePruneForce(t *testing.T) { func TestVolumePrunePromptYes(t *testing.T) { // FIXME(vdemeester) make it work.. - skip.IfCondition(t, runtime.GOOS == "windows", "TODO: fix test on windows") + skip.If(t, runtime.GOOS == "windows", "TODO: fix test on windows") for _, input := range []string{"y", "Y"} { cli := test.NewFakeCli(&fakeClient{ @@ -95,7 +95,7 @@ func TestVolumePrunePromptYes(t *testing.T) { func TestVolumePrunePromptNo(t *testing.T) { // FIXME(vdemeester) make it work.. - skip.IfCondition(t, runtime.GOOS == "windows", "TODO: fix test on windows") + skip.If(t, runtime.GOOS == "windows", "TODO: fix test on windows") for _, input := range []string{"n", "N", "no", "anything", "really"} { cli := test.NewFakeCli(&fakeClient{ diff --git a/cli/command/volume/remove_test.go b/cli/command/volume/remove_test.go index f773a3648e..789d906a87 100644 --- a/cli/command/volume/remove_test.go +++ b/cli/command/volume/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 TestVolumeRemoveErrors(t *testing.T) { diff --git a/cli/compose/convert/compose_test.go b/cli/compose/convert/compose_test.go index 1846df17ee..98b2dc1cc5 100644 --- a/cli/compose/convert/compose_test.go +++ b/cli/compose/convert/compose_test.go @@ -6,9 +6,9 @@ import ( composetypes "github.com/docker/cli/cli/compose/types" "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/gotestyourself/gotestyourself/fs" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" + "gotest.tools/fs" ) func TestNamespaceScope(t *testing.T) { diff --git a/cli/compose/convert/service_test.go b/cli/compose/convert/service_test.go index 3d9e471409..7e5fa4e18a 100644 --- a/cli/compose/convert/service_test.go +++ b/cli/compose/convert/service_test.go @@ -13,9 +13,9 @@ import ( "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/client" - "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 TestConvertRestartPolicyFromNone(t *testing.T) { diff --git a/cli/compose/convert/volume_test.go b/cli/compose/convert/volume_test.go index d7d45eedf5..d29c3b6de2 100644 --- a/cli/compose/convert/volume_test.go +++ b/cli/compose/convert/volume_test.go @@ -5,8 +5,8 @@ import ( composetypes "github.com/docker/cli/cli/compose/types" "github.com/docker/docker/api/types/mount" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func TestConvertVolumeToMountAnonymousVolume(t *testing.T) { diff --git a/cli/compose/interpolation/interpolation_test.go b/cli/compose/interpolation/interpolation_test.go index 42ea55ff1f..3e76642a91 100644 --- a/cli/compose/interpolation/interpolation_test.go +++ b/cli/compose/interpolation/interpolation_test.go @@ -5,9 +5,9 @@ import ( "strconv" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" - "github.com/gotestyourself/gotestyourself/env" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" + "gotest.tools/env" ) var defaults = map[string]string{ diff --git a/cli/compose/loader/loader_test.go b/cli/compose/loader/loader_test.go index 64b7406e60..a00a972eb8 100644 --- a/cli/compose/loader/loader_test.go +++ b/cli/compose/loader/loader_test.go @@ -11,9 +11,9 @@ import ( "github.com/docker/cli/cli/compose/types" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" "github.com/sirupsen/logrus" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func buildConfigDetails(source map[string]interface{}, env map[string]string) types.ConfigDetails { diff --git a/cli/compose/loader/merge_test.go b/cli/compose/loader/merge_test.go index df74ad17f2..178d302da2 100644 --- a/cli/compose/loader/merge_test.go +++ b/cli/compose/loader/merge_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/docker/cli/cli/compose/types" - "github.com/gotestyourself/gotestyourself/assert" + "gotest.tools/assert" ) func TestLoadTwoDifferentVersion(t *testing.T) { diff --git a/cli/compose/loader/types_test.go b/cli/compose/loader/types_test.go index 88f6778092..0d604d8cea 100644 --- a/cli/compose/loader/types_test.go +++ b/cli/compose/loader/types_test.go @@ -3,9 +3,9 @@ package loader import ( "testing" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" yaml "gopkg.in/yaml.v2" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func TestMarshallConfig(t *testing.T) { diff --git a/cli/compose/loader/volume_test.go b/cli/compose/loader/volume_test.go index 5e96b0aeff..ebe5f6b596 100644 --- a/cli/compose/loader/volume_test.go +++ b/cli/compose/loader/volume_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/docker/cli/cli/compose/types" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func TestParseVolumeAnonymousVolume(t *testing.T) { diff --git a/cli/compose/schema/schema_test.go b/cli/compose/schema/schema_test.go index 17ffb203f6..6fa027e495 100644 --- a/cli/compose/schema/schema_test.go +++ b/cli/compose/schema/schema_test.go @@ -3,7 +3,7 @@ package schema import ( "testing" - "github.com/gotestyourself/gotestyourself/assert" + "gotest.tools/assert" ) type dict map[string]interface{} diff --git a/cli/compose/template/template_test.go b/cli/compose/template/template_test.go index 5e4ff9b3ed..48d76bb9fc 100644 --- a/cli/compose/template/template_test.go +++ b/cli/compose/template/template_test.go @@ -4,8 +4,8 @@ import ( "reflect" "testing" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) var defaults = map[string]string{ diff --git a/cli/config/config_test.go b/cli/config/config_test.go index 74c441a4b4..11c8dd6de5 100644 --- a/cli/config/config_test.go +++ b/cli/config/config_test.go @@ -12,9 +12,9 @@ import ( "github.com/docker/cli/cli/config/configfile" "github.com/docker/cli/cli/config/credentials" "github.com/docker/docker/pkg/homedir" - "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 setupConfigDir(t *testing.T) (string, func()) { diff --git a/cli/config/configfile/file_test.go b/cli/config/configfile/file_test.go index 34e3b485b0..f0704cef3f 100644 --- a/cli/config/configfile/file_test.go +++ b/cli/config/configfile/file_test.go @@ -6,8 +6,8 @@ import ( "github.com/docker/cli/cli/config/credentials" "github.com/docker/docker/api/types" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func TestEncodeAuth(t *testing.T) { diff --git a/cli/config/credentials/file_store_test.go b/cli/config/credentials/file_store_test.go index 984dc1fa69..eb27d3774f 100644 --- a/cli/config/credentials/file_store_test.go +++ b/cli/config/credentials/file_store_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/docker/docker/api/types" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) type fakeStore struct { diff --git a/cli/config/credentials/native_store_test.go b/cli/config/credentials/native_store_test.go index 57a506f62c..88befab5ee 100644 --- a/cli/config/credentials/native_store_test.go +++ b/cli/config/credentials/native_store_test.go @@ -11,9 +11,9 @@ import ( "github.com/docker/docker-credential-helpers/client" "github.com/docker/docker-credential-helpers/credentials" "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" ) const ( diff --git a/cli/flags/common_test.go b/cli/flags/common_test.go index 2f06e11e44..7150691ecc 100644 --- a/cli/flags/common_test.go +++ b/cli/flags/common_test.go @@ -5,9 +5,9 @@ import ( "testing" cliconfig "github.com/docker/cli/cli/config" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" "github.com/spf13/pflag" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func TestCommonOptionsInstallFlags(t *testing.T) { diff --git a/cli/manifest/store/store_test.go b/cli/manifest/store/store_test.go index 669b81e7c5..ae56fea924 100644 --- a/cli/manifest/store/store_test.go +++ b/cli/manifest/store/store_test.go @@ -8,8 +8,8 @@ import ( "github.com/docker/cli/cli/manifest/types" "github.com/docker/distribution/reference" "github.com/google/go-cmp/cmp" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) type fakeRef struct { diff --git a/cli/required_test.go b/cli/required_test.go index c82e3b965f..df3e9a467a 100644 --- a/cli/required_test.go +++ b/cli/required_test.go @@ -5,8 +5,8 @@ import ( "io/ioutil" "testing" - "github.com/gotestyourself/gotestyourself/assert" "github.com/spf13/cobra" + "gotest.tools/assert" ) func TestRequiresNoArgs(t *testing.T) { diff --git a/cli/trust/trust_test.go b/cli/trust/trust_test.go index 67e181ba20..b49b7ca878 100644 --- a/cli/trust/trust_test.go +++ b/cli/trust/trust_test.go @@ -6,12 +6,12 @@ import ( "testing" "github.com/docker/distribution/reference" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" digest "github.com/opencontainers/go-digest" "github.com/theupdateframework/notary/client" "github.com/theupdateframework/notary/passphrase" "github.com/theupdateframework/notary/trustpinning" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func TestGetTag(t *testing.T) { diff --git a/cmd/docker/docker_test.go b/cmd/docker/docker_test.go index 1bf30bf7cb..92a9466853 100644 --- a/cmd/docker/docker_test.go +++ b/cmd/docker/docker_test.go @@ -7,9 +7,9 @@ import ( "github.com/docker/cli/cli/command" "github.com/docker/cli/cli/debug" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" "github.com/sirupsen/logrus" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func TestClientDebugEnabled(t *testing.T) { diff --git a/e2e/container/attach_test.go b/e2e/container/attach_test.go index 393d8cc81e..3be6c2ae14 100644 --- a/e2e/container/attach_test.go +++ b/e2e/container/attach_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/docker/cli/e2e/internal/fixtures" - "github.com/gotestyourself/gotestyourself/icmd" + "gotest.tools/icmd" ) func TestAttachExitCode(t *testing.T) { diff --git a/e2e/container/create_test.go b/e2e/container/create_test.go index 23e6883b51..9733808604 100644 --- a/e2e/container/create_test.go +++ b/e2e/container/create_test.go @@ -6,8 +6,8 @@ import ( "github.com/docker/cli/e2e/internal/fixtures" "github.com/docker/cli/internal/test/environment" - "github.com/gotestyourself/gotestyourself/icmd" - "github.com/gotestyourself/gotestyourself/skip" + "gotest.tools/icmd" + "gotest.tools/skip" ) func TestCreateWithContentTrust(t *testing.T) { diff --git a/e2e/container/kill_test.go b/e2e/container/kill_test.go index cfa0193867..d4e71591af 100644 --- a/e2e/container/kill_test.go +++ b/e2e/container/kill_test.go @@ -6,8 +6,8 @@ import ( "time" "github.com/docker/cli/e2e/internal/fixtures" - "github.com/gotestyourself/gotestyourself/icmd" - "github.com/gotestyourself/gotestyourself/poll" + "gotest.tools/icmd" + "gotest.tools/poll" ) func TestKillContainer(t *testing.T) { diff --git a/e2e/container/run_test.go b/e2e/container/run_test.go index ed9f9d0b0b..68a3e40027 100644 --- a/e2e/container/run_test.go +++ b/e2e/container/run_test.go @@ -6,11 +6,11 @@ import ( "github.com/docker/cli/e2e/internal/fixtures" "github.com/docker/cli/internal/test/environment" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" - "github.com/gotestyourself/gotestyourself/golden" - "github.com/gotestyourself/gotestyourself/icmd" - "github.com/gotestyourself/gotestyourself/skip" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" + "gotest.tools/golden" + "gotest.tools/icmd" + "gotest.tools/skip" ) const registryPrefix = "registry:5000" diff --git a/e2e/image/build_test.go b/e2e/image/build_test.go index 4d7ff08975..7d89a6f3b5 100644 --- a/e2e/image/build_test.go +++ b/e2e/image/build_test.go @@ -7,9 +7,9 @@ import ( "github.com/docker/cli/e2e/internal/fixtures" "github.com/docker/cli/internal/test/environment" "github.com/docker/cli/internal/test/output" - "github.com/gotestyourself/gotestyourself/fs" - "github.com/gotestyourself/gotestyourself/icmd" - "github.com/gotestyourself/gotestyourself/skip" + "gotest.tools/fs" + "gotest.tools/icmd" + "gotest.tools/skip" ) func TestBuildFromContextDirectoryWithTag(t *testing.T) { diff --git a/e2e/image/pull_test.go b/e2e/image/pull_test.go index fbf14d46b1..625ccd5993 100644 --- a/e2e/image/pull_test.go +++ b/e2e/image/pull_test.go @@ -5,9 +5,9 @@ import ( "github.com/docker/cli/e2e/internal/fixtures" "github.com/docker/cli/internal/test/environment" - "github.com/gotestyourself/gotestyourself/golden" - "github.com/gotestyourself/gotestyourself/icmd" - "github.com/gotestyourself/gotestyourself/skip" + "gotest.tools/golden" + "gotest.tools/icmd" + "gotest.tools/skip" ) const registryPrefix = "registry:5000" diff --git a/e2e/image/push_test.go b/e2e/image/push_test.go index 6b21f1196b..91dbc1cba8 100644 --- a/e2e/image/push_test.go +++ b/e2e/image/push_test.go @@ -10,11 +10,11 @@ import ( "github.com/docker/cli/e2e/internal/fixtures" "github.com/docker/cli/internal/test/environment" "github.com/docker/cli/internal/test/output" - "github.com/gotestyourself/gotestyourself/assert" - "github.com/gotestyourself/gotestyourself/fs" - "github.com/gotestyourself/gotestyourself/golden" - "github.com/gotestyourself/gotestyourself/icmd" - "github.com/gotestyourself/gotestyourself/skip" + "gotest.tools/assert" + "gotest.tools/fs" + "gotest.tools/golden" + "gotest.tools/icmd" + "gotest.tools/skip" ) const ( diff --git a/e2e/internal/fixtures/fixtures.go b/e2e/internal/fixtures/fixtures.go index 528e07b955..99343f6541 100644 --- a/e2e/internal/fixtures/fixtures.go +++ b/e2e/internal/fixtures/fixtures.go @@ -5,8 +5,8 @@ import ( "os" "testing" - "github.com/gotestyourself/gotestyourself/fs" - "github.com/gotestyourself/gotestyourself/icmd" + "gotest.tools/fs" + "gotest.tools/icmd" ) const ( diff --git a/e2e/plugin/trust_test.go b/e2e/plugin/trust_test.go index f19034e384..8dc3cad87a 100644 --- a/e2e/plugin/trust_test.go +++ b/e2e/plugin/trust_test.go @@ -11,11 +11,11 @@ import ( "github.com/docker/cli/e2e/internal/fixtures" "github.com/docker/cli/internal/test/environment" "github.com/docker/docker/api/types" - "github.com/gotestyourself/gotestyourself/assert" - "github.com/gotestyourself/gotestyourself/fs" - "github.com/gotestyourself/gotestyourself/icmd" - "github.com/gotestyourself/gotestyourself/skip" "github.com/pkg/errors" + "gotest.tools/assert" + "gotest.tools/fs" + "gotest.tools/icmd" + "gotest.tools/skip" ) const registryPrefix = "registry:5000" diff --git a/e2e/stack/deploy_test.go b/e2e/stack/deploy_test.go index a19f1ea81a..a0e7d28608 100644 --- a/e2e/stack/deploy_test.go +++ b/e2e/stack/deploy_test.go @@ -7,10 +7,10 @@ import ( "testing" "github.com/docker/cli/internal/test/environment" - "github.com/gotestyourself/gotestyourself/assert" - "github.com/gotestyourself/gotestyourself/golden" - "github.com/gotestyourself/gotestyourself/icmd" - "github.com/gotestyourself/gotestyourself/skip" + "gotest.tools/assert" + "gotest.tools/golden" + "gotest.tools/icmd" + "gotest.tools/skip" ) func TestDeployWithNamedResources(t *testing.T) { diff --git a/e2e/stack/remove_test.go b/e2e/stack/remove_test.go index 47ec92bbef..27300b1cc2 100644 --- a/e2e/stack/remove_test.go +++ b/e2e/stack/remove_test.go @@ -6,10 +6,10 @@ import ( "testing" "github.com/docker/cli/internal/test/environment" - "github.com/gotestyourself/gotestyourself/golden" - "github.com/gotestyourself/gotestyourself/icmd" - "github.com/gotestyourself/gotestyourself/poll" - "github.com/gotestyourself/gotestyourself/skip" + "gotest.tools/golden" + "gotest.tools/icmd" + "gotest.tools/poll" + "gotest.tools/skip" ) var pollSettings = environment.DefaultPollSettings diff --git a/e2e/system/inspect_test.go b/e2e/system/inspect_test.go index aefab51606..2b32959721 100644 --- a/e2e/system/inspect_test.go +++ b/e2e/system/inspect_test.go @@ -3,7 +3,7 @@ package system import ( "testing" - "github.com/gotestyourself/gotestyourself/icmd" + "gotest.tools/icmd" ) // TestInspectInvalidReference migrated from moby/integration-cli diff --git a/e2e/trust/revoke_test.go b/e2e/trust/revoke_test.go index b356bd76cf..85b1cdc0e1 100644 --- a/e2e/trust/revoke_test.go +++ b/e2e/trust/revoke_test.go @@ -6,11 +6,11 @@ import ( "github.com/docker/cli/e2e/internal/fixtures" "github.com/docker/cli/internal/test/environment" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" - "github.com/gotestyourself/gotestyourself/fs" - "github.com/gotestyourself/gotestyourself/icmd" - "github.com/gotestyourself/gotestyourself/skip" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" + "gotest.tools/fs" + "gotest.tools/icmd" + "gotest.tools/skip" ) const ( diff --git a/e2e/trust/sign_test.go b/e2e/trust/sign_test.go index 5dbf959ae5..ffa320e904 100644 --- a/e2e/trust/sign_test.go +++ b/e2e/trust/sign_test.go @@ -6,11 +6,11 @@ import ( "github.com/docker/cli/e2e/internal/fixtures" "github.com/docker/cli/internal/test/environment" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" - "github.com/gotestyourself/gotestyourself/fs" - "github.com/gotestyourself/gotestyourself/icmd" - "github.com/gotestyourself/gotestyourself/skip" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" + "gotest.tools/fs" + "gotest.tools/icmd" + "gotest.tools/skip" ) const ( diff --git a/internal/test/environment/testenv.go b/internal/test/environment/testenv.go index 9d719014b7..3e4ef8495d 100644 --- a/internal/test/environment/testenv.go +++ b/internal/test/environment/testenv.go @@ -5,8 +5,8 @@ import ( "strings" "time" - "github.com/gotestyourself/gotestyourself/poll" "github.com/pkg/errors" + "gotest.tools/poll" ) // Setup a new environment diff --git a/kubernetes/check_test.go b/kubernetes/check_test.go index a8a6e65931..e9b9aa7f9a 100644 --- a/kubernetes/check_test.go +++ b/kubernetes/check_test.go @@ -3,8 +3,8 @@ package kubernetes import ( "testing" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/kubernetes/labels/labels_test.go b/kubernetes/labels/labels_test.go index d99f881829..7815b73d34 100644 --- a/kubernetes/labels/labels_test.go +++ b/kubernetes/labels/labels_test.go @@ -3,8 +3,8 @@ package labels import ( "testing" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func TestForService(t *testing.T) { diff --git a/opts/duration_test.go b/opts/duration_test.go index 937585d89e..1a2c76a8d3 100644 --- a/opts/duration_test.go +++ b/opts/duration_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func TestDurationOptString(t *testing.T) { diff --git a/opts/mount_test.go b/opts/mount_test.go index bf7b0f2012..e59f07fe62 100644 --- a/opts/mount_test.go +++ b/opts/mount_test.go @@ -5,8 +5,8 @@ import ( "testing" mounttypes "github.com/docker/docker/api/types/mount" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func TestMountOptString(t *testing.T) { diff --git a/opts/network_test.go b/opts/network_test.go index 357ac10804..5219d14a3a 100644 --- a/opts/network_test.go +++ b/opts/network_test.go @@ -3,8 +3,8 @@ package opts import ( "testing" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func TestNetworkOptLegacySyntax(t *testing.T) { diff --git a/opts/port_test.go b/opts/port_test.go index 7f07a86cfe..fb3498f7c5 100644 --- a/opts/port_test.go +++ b/opts/port_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/docker/docker/api/types/swarm" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func TestPortOptValidSimpleSyntax(t *testing.T) { diff --git a/opts/quotedstring_test.go b/opts/quotedstring_test.go index a23448f1b1..72ec6a21cb 100644 --- a/opts/quotedstring_test.go +++ b/opts/quotedstring_test.go @@ -3,8 +3,8 @@ package opts import ( "testing" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func TestQuotedStringSetWithQuotes(t *testing.T) { diff --git a/opts/secret_test.go b/opts/secret_test.go index 95ed752148..94dd80d19a 100644 --- a/opts/secret_test.go +++ b/opts/secret_test.go @@ -4,8 +4,8 @@ import ( "os" "testing" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) func TestSecretOptionsSimple(t *testing.T) { diff --git a/service/logs/parse_logs_test.go b/service/logs/parse_logs_test.go index a8f612ce4a..24bd0db7b7 100644 --- a/service/logs/parse_logs_test.go +++ b/service/logs/parse_logs_test.go @@ -3,9 +3,9 @@ package logs import ( "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" ) func TestParseLogDetails(t *testing.T) { diff --git a/templates/templates_test.go b/templates/templates_test.go index fa4d773395..102de2bd9f 100644 --- a/templates/templates_test.go +++ b/templates/templates_test.go @@ -4,8 +4,8 @@ import ( "bytes" "testing" - "github.com/gotestyourself/gotestyourself/assert" - is "github.com/gotestyourself/gotestyourself/assert/cmp" + "gotest.tools/assert" + is "gotest.tools/assert/cmp" ) // GitHub #32120