diff --git a/integration-cli/daemon/daemon.go b/integration-cli/daemon/daemon.go index d1cb86298f..7cb6db1b37 100644 --- a/integration-cli/daemon/daemon.go +++ b/integration-cli/daemon/daemon.go @@ -7,7 +7,6 @@ import ( "time" "github.com/docker/docker/internal/test/daemon" - "github.com/go-check/check" "github.com/pkg/errors" "gotest.tools/assert" "gotest.tools/icmd" diff --git a/integration-cli/daemon/daemon_swarm.go b/integration-cli/daemon/daemon_swarm.go index 6aa8671cb3..2551147b84 100644 --- a/integration-cli/daemon/daemon_swarm.go +++ b/integration-cli/daemon/daemon_swarm.go @@ -10,7 +10,6 @@ import ( "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/client" - "github.com/go-check/check" "gotest.tools/assert" ) diff --git a/integration-cli/docker_api_containers_test.go b/integration-cli/docker_api_containers_test.go index e5dd72e920..37fc6fa123 100644 --- a/integration-cli/docker_api_containers_test.go +++ b/integration-cli/docker_api_containers_test.go @@ -31,7 +31,6 @@ import ( "github.com/docker/docker/pkg/stringid" "github.com/docker/docker/volume" "github.com/docker/go-connections/nat" - "github.com/go-check/check" "gotest.tools/assert" is "gotest.tools/assert/cmp" "gotest.tools/poll" diff --git a/integration-cli/docker_api_exec_test.go b/integration-cli/docker_api_exec_test.go index d8cc42b45d..118fd05316 100644 --- a/integration-cli/docker_api_exec_test.go +++ b/integration-cli/docker_api_exec_test.go @@ -17,7 +17,6 @@ import ( "github.com/docker/docker/client" "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/internal/test/request" - "github.com/go-check/check" "gotest.tools/assert" ) diff --git a/integration-cli/docker_api_swarm_node_test.go b/integration-cli/docker_api_swarm_node_test.go index 05de8d2043..d55dc68aef 100644 --- a/integration-cli/docker_api_swarm_node_test.go +++ b/integration-cli/docker_api_swarm_node_test.go @@ -3,13 +3,13 @@ package main import ( + "fmt" "testing" "time" "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/integration-cli/daemon" - "github.com/go-check/check" "gotest.tools/assert" ) diff --git a/integration-cli/docker_api_swarm_service_test.go b/integration-cli/docker_api_swarm_service_test.go index 475467f42d..fac46f87cf 100644 --- a/integration-cli/docker_api_swarm_service_test.go +++ b/integration-cli/docker_api_swarm_service_test.go @@ -17,7 +17,6 @@ import ( "github.com/docker/docker/integration-cli/cli/build" "github.com/docker/docker/integration-cli/daemon" testdaemon "github.com/docker/docker/internal/test/daemon" - "github.com/go-check/check" "golang.org/x/sys/unix" "gotest.tools/assert" "gotest.tools/icmd" diff --git a/integration-cli/docker_api_swarm_test.go b/integration-cli/docker_api_swarm_test.go index b66cdd2677..bb02a07d7b 100644 --- a/integration-cli/docker_api_swarm_test.go +++ b/integration-cli/docker_api_swarm_test.go @@ -27,7 +27,6 @@ import ( testdaemon "github.com/docker/docker/internal/test/daemon" "github.com/docker/docker/internal/test/request" "github.com/docker/swarmkit/ca" - "github.com/go-check/check" "github.com/pkg/errors" "gotest.tools/assert" is "gotest.tools/assert/cmp" diff --git a/integration-cli/docker_cli_attach_unix_test.go b/integration-cli/docker_cli_attach_unix_test.go index 697768c52a..91e1e40d27 100644 --- a/integration-cli/docker_cli_attach_unix_test.go +++ b/integration-cli/docker_cli_attach_unix_test.go @@ -4,6 +4,7 @@ package main import ( "bufio" + "fmt" "io/ioutil" "os/exec" "strings" @@ -11,7 +12,6 @@ import ( "time" "github.com/creack/pty" - "github.com/go-check/check" "gotest.tools/assert" ) diff --git a/integration-cli/docker_cli_build_test.go b/integration-cli/docker_cli_build_test.go index 2ff365df53..eb38935715 100644 --- a/integration-cli/docker_cli_build_test.go +++ b/integration-cli/docker_cli_build_test.go @@ -25,7 +25,6 @@ import ( "github.com/docker/docker/internal/testutil" "github.com/docker/docker/pkg/archive" "github.com/docker/docker/pkg/system" - "github.com/go-check/check" "github.com/moby/buildkit/frontend/dockerfile/command" "github.com/opencontainers/go-digest" "gotest.tools/assert" diff --git a/integration-cli/docker_cli_build_unix_test.go b/integration-cli/docker_cli_build_unix_test.go index 5e7ea55bc7..ef6da0e623 100644 --- a/integration-cli/docker_cli_build_unix_test.go +++ b/integration-cli/docker_cli_build_unix_test.go @@ -20,7 +20,6 @@ import ( "github.com/docker/docker/integration-cli/cli/build" "github.com/docker/docker/internal/test/fakecontext" "github.com/docker/go-units" - "github.com/go-check/check" "gotest.tools/assert" "gotest.tools/icmd" ) diff --git a/integration-cli/docker_cli_by_digest_test.go b/integration-cli/docker_cli_by_digest_test.go index 5450e2d80d..4d5e91070e 100644 --- a/integration-cli/docker_cli_by_digest_test.go +++ b/integration-cli/docker_cli_by_digest_test.go @@ -14,7 +14,6 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/integration-cli/cli" "github.com/docker/docker/integration-cli/cli/build" - "github.com/go-check/check" "github.com/opencontainers/go-digest" "gotest.tools/assert" is "gotest.tools/assert/cmp" diff --git a/integration-cli/docker_cli_commit_test.go b/integration-cli/docker_cli_commit_test.go index c58db9cc04..852d2c6cf1 100644 --- a/integration-cli/docker_cli_commit_test.go +++ b/integration-cli/docker_cli_commit_test.go @@ -1,12 +1,12 @@ package main import ( + "fmt" "strings" "testing" "github.com/docker/docker/api/types/versions" "github.com/docker/docker/integration-cli/cli" - "github.com/go-check/check" "gotest.tools/assert" ) diff --git a/integration-cli/docker_cli_cp_from_container_test.go b/integration-cli/docker_cli_cp_from_container_test.go index a89c07db36..19ad91fb30 100644 --- a/integration-cli/docker_cli_cp_from_container_test.go +++ b/integration-cli/docker_cli_cp_from_container_test.go @@ -1,11 +1,11 @@ package main import ( + "fmt" "os" "path/filepath" "testing" - "github.com/go-check/check" "gotest.tools/assert" ) diff --git a/integration-cli/docker_cli_cp_to_container_test.go b/integration-cli/docker_cli_cp_to_container_test.go index c1b21a7c7c..bf0fd8d89e 100644 --- a/integration-cli/docker_cli_cp_to_container_test.go +++ b/integration-cli/docker_cli_cp_to_container_test.go @@ -1,10 +1,10 @@ package main import ( + "fmt" "os" "testing" - "github.com/go-check/check" "gotest.tools/assert" ) diff --git a/integration-cli/docker_cli_create_test.go b/integration-cli/docker_cli_create_test.go index a470d2a633..36764eb36b 100644 --- a/integration-cli/docker_cli_create_test.go +++ b/integration-cli/docker_cli_create_test.go @@ -14,7 +14,6 @@ import ( "github.com/docker/docker/internal/test/fakecontext" "github.com/docker/docker/pkg/stringid" "github.com/docker/go-connections/nat" - "github.com/go-check/check" "gotest.tools/assert" is "gotest.tools/assert/cmp" ) diff --git a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_cli_daemon_test.go index 61f262a3c4..b13d6550b2 100644 --- a/integration-cli/docker_cli_daemon_test.go +++ b/integration-cli/docker_cli_daemon_test.go @@ -37,7 +37,6 @@ import ( "github.com/docker/go-units" "github.com/docker/libnetwork/iptables" "github.com/docker/libtrust" - "github.com/go-check/check" "golang.org/x/sys/unix" "gotest.tools/assert" "gotest.tools/icmd" diff --git a/integration-cli/docker_cli_external_volume_driver_unix_test.go b/integration-cli/docker_cli_external_volume_driver_unix_test.go index 9ca86ce277..ef388a7f25 100644 --- a/integration-cli/docker_cli_external_volume_driver_unix_test.go +++ b/integration-cli/docker_cli_external_volume_driver_unix_test.go @@ -21,7 +21,6 @@ import ( testdaemon "github.com/docker/docker/internal/test/daemon" "github.com/docker/docker/pkg/stringid" "github.com/docker/docker/volume" - "github.com/go-check/check" "gotest.tools/assert" ) diff --git a/integration-cli/docker_cli_history_test.go b/integration-cli/docker_cli_history_test.go index 4aff7a2883..b6f5242562 100644 --- a/integration-cli/docker_cli_history_test.go +++ b/integration-cli/docker_cli_history_test.go @@ -8,7 +8,6 @@ import ( "testing" "github.com/docker/docker/integration-cli/cli/build" - "github.com/go-check/check" "gotest.tools/assert" "gotest.tools/assert/cmp" ) diff --git a/integration-cli/docker_cli_images_test.go b/integration-cli/docker_cli_images_test.go index 18bc855848..6caa75b94b 100644 --- a/integration-cli/docker_cli_images_test.go +++ b/integration-cli/docker_cli_images_test.go @@ -13,7 +13,6 @@ import ( "github.com/docker/docker/integration-cli/cli/build" "github.com/docker/docker/pkg/stringid" - "github.com/go-check/check" "gotest.tools/assert" is "gotest.tools/assert/cmp" "gotest.tools/icmd" diff --git a/integration-cli/docker_cli_import_test.go b/integration-cli/docker_cli_import_test.go index 516dc070f3..3506c18188 100644 --- a/integration-cli/docker_cli_import_test.go +++ b/integration-cli/docker_cli_import_test.go @@ -11,7 +11,6 @@ import ( "testing" "github.com/docker/docker/integration-cli/cli" - "github.com/go-check/check" "gotest.tools/assert" "gotest.tools/icmd" ) diff --git a/integration-cli/docker_cli_info_test.go b/integration-cli/docker_cli_info_test.go index ff0e2a5888..173eec22f6 100644 --- a/integration-cli/docker_cli_info_test.go +++ b/integration-cli/docker_cli_info_test.go @@ -9,7 +9,6 @@ import ( "github.com/docker/docker/integration-cli/daemon" testdaemon "github.com/docker/docker/internal/test/daemon" - "github.com/go-check/check" "gotest.tools/assert" ) diff --git a/integration-cli/docker_cli_inspect_test.go b/integration-cli/docker_cli_inspect_test.go index f770f69c77..7b746f9ee2 100644 --- a/integration-cli/docker_cli_inspect_test.go +++ b/integration-cli/docker_cli_inspect_test.go @@ -11,7 +11,6 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" - "github.com/go-check/check" "gotest.tools/assert" "gotest.tools/icmd" ) diff --git a/integration-cli/docker_cli_links_test.go b/integration-cli/docker_cli_links_test.go index 9e9f9bd277..4216aadf01 100644 --- a/integration-cli/docker_cli_links_test.go +++ b/integration-cli/docker_cli_links_test.go @@ -9,7 +9,6 @@ import ( "testing" "github.com/docker/docker/runconfig" - "github.com/go-check/check" "gotest.tools/assert" "gotest.tools/assert/cmp" ) diff --git a/integration-cli/docker_cli_netmode_test.go b/integration-cli/docker_cli_netmode_test.go index 43c49149a4..98b33c2a6b 100644 --- a/integration-cli/docker_cli_netmode_test.go +++ b/integration-cli/docker_cli_netmode_test.go @@ -1,11 +1,11 @@ package main import ( + "fmt" "strings" "testing" "github.com/docker/docker/runconfig" - "github.com/go-check/check" "gotest.tools/assert" ) diff --git a/integration-cli/docker_cli_network_unix_test.go b/integration-cli/docker_cli_network_unix_test.go index d9ff11fc17..2fadf13f81 100644 --- a/integration-cli/docker_cli_network_unix_test.go +++ b/integration-cli/docker_cli_network_unix_test.go @@ -26,7 +26,6 @@ import ( "github.com/docker/libnetwork/ipamapi" remoteipam "github.com/docker/libnetwork/ipams/remote/api" "github.com/docker/libnetwork/netlabel" - "github.com/go-check/check" "github.com/vishvananda/netlink" "golang.org/x/sys/unix" "gotest.tools/assert" diff --git a/integration-cli/docker_cli_plugins_test.go b/integration-cli/docker_cli_plugins_test.go index a5d37e7db8..576c39a863 100644 --- a/integration-cli/docker_cli_plugins_test.go +++ b/integration-cli/docker_cli_plugins_test.go @@ -16,7 +16,6 @@ import ( "github.com/docker/docker/integration-cli/cli" "github.com/docker/docker/integration-cli/daemon" "github.com/docker/docker/internal/test/fixtures/plugin" - "github.com/go-check/check" "gotest.tools/assert" ) diff --git a/integration-cli/docker_cli_port_test.go b/integration-cli/docker_cli_port_test.go index f08e6c6b55..3479280739 100644 --- a/integration-cli/docker_cli_port_test.go +++ b/integration-cli/docker_cli_port_test.go @@ -9,7 +9,6 @@ import ( "strings" "testing" - "github.com/go-check/check" "gotest.tools/assert" ) diff --git a/integration-cli/docker_cli_prune_unix_test.go b/integration-cli/docker_cli_prune_unix_test.go index 275c5f6f63..f4b1ad9375 100644 --- a/integration-cli/docker_cli_prune_unix_test.go +++ b/integration-cli/docker_cli_prune_unix_test.go @@ -15,7 +15,6 @@ import ( "github.com/docker/docker/integration-cli/cli" "github.com/docker/docker/integration-cli/cli/build" "github.com/docker/docker/integration-cli/daemon" - "github.com/go-check/check" "gotest.tools/assert" "gotest.tools/icmd" ) diff --git a/integration-cli/docker_cli_ps_test.go b/integration-cli/docker_cli_ps_test.go index 3f8559fdcb..d78ebb169d 100644 --- a/integration-cli/docker_cli_ps_test.go +++ b/integration-cli/docker_cli_ps_test.go @@ -12,7 +12,6 @@ import ( "github.com/docker/docker/integration-cli/cli" "github.com/docker/docker/integration-cli/cli/build" "github.com/docker/docker/pkg/stringid" - "github.com/go-check/check" "gotest.tools/assert" is "gotest.tools/assert/cmp" "gotest.tools/icmd" diff --git a/integration-cli/docker_cli_pull_local_test.go b/integration-cli/docker_cli_pull_local_test.go index 714ab26e43..94df86d4c9 100644 --- a/integration-cli/docker_cli_pull_local_test.go +++ b/integration-cli/docker_cli_pull_local_test.go @@ -15,7 +15,6 @@ import ( "github.com/docker/distribution/manifest/manifestlist" "github.com/docker/distribution/manifest/schema2" "github.com/docker/docker/integration-cli/cli/build" - "github.com/go-check/check" "github.com/opencontainers/go-digest" "gotest.tools/assert" "gotest.tools/icmd" diff --git a/integration-cli/docker_cli_restart_test.go b/integration-cli/docker_cli_restart_test.go index 39e280d9b4..aced423775 100644 --- a/integration-cli/docker_cli_restart_test.go +++ b/integration-cli/docker_cli_restart_test.go @@ -8,7 +8,6 @@ import ( "time" "github.com/docker/docker/integration-cli/checker" - "github.com/go-check/check" "gotest.tools/assert" is "gotest.tools/assert/cmp" ) diff --git a/integration-cli/docker_cli_rmi_test.go b/integration-cli/docker_cli_rmi_test.go index b5c5dc1cde..24c74157de 100644 --- a/integration-cli/docker_cli_rmi_test.go +++ b/integration-cli/docker_cli_rmi_test.go @@ -9,7 +9,6 @@ import ( "github.com/docker/docker/integration-cli/cli" "github.com/docker/docker/integration-cli/cli/build" "github.com/docker/docker/pkg/stringid" - "github.com/go-check/check" "gotest.tools/assert" "gotest.tools/icmd" ) diff --git a/integration-cli/docker_cli_run_test.go b/integration-cli/docker_cli_run_test.go index 3e7ec0dc37..1fa448a1ef 100644 --- a/integration-cli/docker_cli_run_test.go +++ b/integration-cli/docker_cli_run_test.go @@ -36,7 +36,6 @@ import ( "github.com/docker/go-connections/nat" "github.com/docker/libnetwork/resolvconf" "github.com/docker/libnetwork/types" - "github.com/go-check/check" "gotest.tools/assert" "gotest.tools/icmd" ) diff --git a/integration-cli/docker_cli_run_unix_test.go b/integration-cli/docker_cli_run_unix_test.go index d3fe4e917c..266c07e925 100644 --- a/integration-cli/docker_cli_run_unix_test.go +++ b/integration-cli/docker_cli_run_unix_test.go @@ -26,7 +26,6 @@ import ( "github.com/docker/docker/pkg/mount" "github.com/docker/docker/pkg/parsers" "github.com/docker/docker/pkg/sysinfo" - "github.com/go-check/check" "gotest.tools/assert" "gotest.tools/icmd" ) diff --git a/integration-cli/docker_cli_save_load_test.go b/integration-cli/docker_cli_save_load_test.go index 1941df58e8..9249461b2a 100644 --- a/integration-cli/docker_cli_save_load_test.go +++ b/integration-cli/docker_cli_save_load_test.go @@ -17,7 +17,6 @@ import ( "time" "github.com/docker/docker/integration-cli/cli/build" - "github.com/go-check/check" "github.com/opencontainers/go-digest" "gotest.tools/assert" is "gotest.tools/assert/cmp" diff --git a/integration-cli/docker_cli_service_create_test.go b/integration-cli/docker_cli_service_create_test.go index 66cd45204f..f988d49bfd 100644 --- a/integration-cli/docker_cli_service_create_test.go +++ b/integration-cli/docker_cli_service_create_test.go @@ -13,7 +13,6 @@ import ( "github.com/docker/docker/api/types/mount" "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/integration-cli/checker" - "github.com/go-check/check" "gotest.tools/assert" ) diff --git a/integration-cli/docker_cli_service_health_test.go b/integration-cli/docker_cli_service_health_test.go index a1383701c7..b678b99019 100644 --- a/integration-cli/docker_cli_service_health_test.go +++ b/integration-cli/docker_cli_service_health_test.go @@ -12,7 +12,6 @@ import ( "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/integration-cli/cli" "github.com/docker/docker/integration-cli/cli/build" - "github.com/go-check/check" "gotest.tools/assert" "gotest.tools/icmd" ) diff --git a/integration-cli/docker_cli_service_logs_test.go b/integration-cli/docker_cli_service_logs_test.go index caa85bc56e..a06b13eff6 100644 --- a/integration-cli/docker_cli_service_logs_test.go +++ b/integration-cli/docker_cli_service_logs_test.go @@ -13,7 +13,6 @@ import ( "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/integration-cli/daemon" - "github.com/go-check/check" "gotest.tools/assert" "gotest.tools/icmd" ) diff --git a/integration-cli/docker_cli_start_test.go b/integration-cli/docker_cli_start_test.go index 33b6b11133..ecc2d2ed8d 100644 --- a/integration-cli/docker_cli_start_test.go +++ b/integration-cli/docker_cli_start_test.go @@ -7,7 +7,6 @@ import ( "time" "github.com/docker/docker/integration-cli/cli" - "github.com/go-check/check" "gotest.tools/assert" "gotest.tools/icmd" ) diff --git a/integration-cli/docker_cli_swarm_test.go b/integration-cli/docker_cli_swarm_test.go index d921504e20..b459292aa2 100644 --- a/integration-cli/docker_cli_swarm_test.go +++ b/integration-cli/docker_cli_swarm_test.go @@ -28,7 +28,6 @@ import ( "github.com/docker/libnetwork/ipamapi" remoteipam "github.com/docker/libnetwork/ipams/remote/api" "github.com/docker/swarmkit/ca/keyutils" - "github.com/go-check/check" "github.com/vishvananda/netlink" "gotest.tools/assert" "gotest.tools/fs" diff --git a/integration-cli/docker_cli_userns_test.go b/integration-cli/docker_cli_userns_test.go index 5808764169..086f7e5f5c 100644 --- a/integration-cli/docker_cli_userns_test.go +++ b/integration-cli/docker_cli_userns_test.go @@ -15,7 +15,6 @@ import ( "github.com/docker/docker/pkg/stringid" "github.com/docker/docker/pkg/system" - "github.com/go-check/check" "gotest.tools/assert" ) diff --git a/integration-cli/docker_cli_volume_test.go b/integration-cli/docker_cli_volume_test.go index d85d894a8c..a561735d21 100644 --- a/integration-cli/docker_cli_volume_test.go +++ b/integration-cli/docker_cli_volume_test.go @@ -15,7 +15,6 @@ import ( "github.com/docker/docker/api/types/network" "github.com/docker/docker/client" "github.com/docker/docker/integration-cli/cli/build" - "github.com/go-check/check" "gotest.tools/assert" "gotest.tools/icmd" ) diff --git a/integration-cli/docker_hub_pull_suite_test.go b/integration-cli/docker_hub_pull_suite_test.go index 1462d942e5..cbf1b521bd 100644 --- a/integration-cli/docker_hub_pull_suite_test.go +++ b/integration-cli/docker_hub_pull_suite_test.go @@ -1,6 +1,7 @@ package main import ( + "fmt" "os/exec" "runtime" "strings" @@ -8,7 +9,6 @@ import ( "github.com/docker/docker/integration-cli/daemon" testdaemon "github.com/docker/docker/internal/test/daemon" - "github.com/go-check/check" "gotest.tools/assert" ) diff --git a/integration-cli/docker_utils_test.go b/integration-cli/docker_utils_test.go index 0b9bd97a79..0dc634c1f3 100644 --- a/integration-cli/docker_utils_test.go +++ b/integration-cli/docker_utils_test.go @@ -19,7 +19,6 @@ import ( "github.com/docker/docker/client" "github.com/docker/docker/integration-cli/cli" "github.com/docker/docker/integration-cli/daemon" - "github.com/go-check/check" "gotest.tools/assert" "gotest.tools/icmd" )