From 59e55dcdd063d3131ed1992254350b7014d1bf1f Mon Sep 17 00:00:00 2001 From: Tibor Vass Date: Mon, 9 Sep 2019 21:06:12 +0000 Subject: [PATCH] rm-gocheck: run goimports to compile successfully goimports -w \ -- "./integration-cli/daemon" "./pkg/discovery" "./pkg/discovery/file" "./pkg/discovery/kv" "./pkg/discovery/memory" "./pkg/discovery/nodes" "./integration-cli" \ && \ gofmt -w -s \ -- "./integration-cli/daemon" "./pkg/discovery" "./pkg/discovery/file" "./pkg/discovery/kv" "./pkg/discovery/memory" "./pkg/discovery/nodes" "./integration-cli" Signed-off-by: Tibor Vass --- integration-cli/benchmark_test.go | 2 +- integration-cli/check_test.go | 1 - integration-cli/daemon/daemon.go | 1 + integration-cli/daemon/daemon_swarm.go | 1 + integration-cli/daemon_swarm_hack_test.go | 3 ++- integration-cli/docker_api_attach_test.go | 2 +- integration-cli/docker_api_build_test.go | 2 +- integration-cli/docker_api_build_windows_test.go | 2 +- integration-cli/docker_api_containers_test.go | 1 + integration-cli/docker_api_containers_windows_test.go | 2 +- integration-cli/docker_api_exec_resize_test.go | 2 +- integration-cli/docker_api_exec_test.go | 1 + integration-cli/docker_api_images_test.go | 2 +- integration-cli/docker_api_inspect_test.go | 2 +- integration-cli/docker_api_logs_test.go | 2 +- integration-cli/docker_api_network_test.go | 2 +- integration-cli/docker_api_stats_test.go | 2 +- integration-cli/docker_api_swarm_node_test.go | 2 ++ integration-cli/docker_api_swarm_service_test.go | 1 + integration-cli/docker_api_swarm_test.go | 1 + integration-cli/docker_api_test.go | 2 +- integration-cli/docker_cli_attach_test.go | 2 +- integration-cli/docker_cli_attach_unix_test.go | 1 + integration-cli/docker_cli_build_test.go | 1 + integration-cli/docker_cli_build_unix_test.go | 2 +- integration-cli/docker_cli_by_digest_test.go | 1 + integration-cli/docker_cli_commit_test.go | 2 ++ integration-cli/docker_cli_cp_from_container_test.go | 2 +- integration-cli/docker_cli_cp_test.go | 2 +- integration-cli/docker_cli_cp_to_container_test.go | 2 +- integration-cli/docker_cli_cp_to_container_unix_test.go | 2 +- integration-cli/docker_cli_cp_utils_test.go | 2 +- integration-cli/docker_cli_create_test.go | 1 + integration-cli/docker_cli_daemon_plugins_test.go | 2 +- integration-cli/docker_cli_daemon_test.go | 1 + integration-cli/docker_cli_events_test.go | 2 +- integration-cli/docker_cli_events_unix_test.go | 2 +- integration-cli/docker_cli_exec_test.go | 2 +- integration-cli/docker_cli_exec_unix_test.go | 2 +- .../docker_cli_external_volume_driver_unix_test.go | 1 + integration-cli/docker_cli_health_test.go | 4 ++-- integration-cli/docker_cli_history_test.go | 2 ++ integration-cli/docker_cli_images_test.go | 1 + integration-cli/docker_cli_import_test.go | 2 +- integration-cli/docker_cli_info_test.go | 1 + integration-cli/docker_cli_info_unix_test.go | 4 +++- integration-cli/docker_cli_inspect_test.go | 1 + integration-cli/docker_cli_links_test.go | 1 + integration-cli/docker_cli_login_test.go | 2 +- integration-cli/docker_cli_logout_test.go | 2 +- integration-cli/docker_cli_logs_bench_test.go | 3 +-- integration-cli/docker_cli_logs_test.go | 2 +- integration-cli/docker_cli_netmode_test.go | 2 ++ integration-cli/docker_cli_network_unix_test.go | 1 + integration-cli/docker_cli_plugins_logdriver_test.go | 2 +- integration-cli/docker_cli_plugins_test.go | 1 + integration-cli/docker_cli_port_test.go | 1 + integration-cli/docker_cli_proxy_test.go | 2 +- integration-cli/docker_cli_prune_unix_test.go | 1 + integration-cli/docker_cli_ps_test.go | 1 + integration-cli/docker_cli_pull_local_test.go | 1 + integration-cli/docker_cli_pull_test.go | 2 +- integration-cli/docker_cli_push_test.go | 2 +- integration-cli/docker_cli_registry_user_agent_test.go | 2 +- integration-cli/docker_cli_restart_test.go | 1 + integration-cli/docker_cli_rmi_test.go | 1 + integration-cli/docker_cli_run_test.go | 1 + integration-cli/docker_cli_run_unix_test.go | 1 + integration-cli/docker_cli_save_load_test.go | 1 + integration-cli/docker_cli_save_load_unix_test.go | 2 +- integration-cli/docker_cli_search_test.go | 2 +- integration-cli/docker_cli_service_create_test.go | 1 + integration-cli/docker_cli_service_health_test.go | 1 + integration-cli/docker_cli_service_logs_test.go | 1 + integration-cli/docker_cli_service_scale_test.go | 2 +- integration-cli/docker_cli_sni_test.go | 2 +- integration-cli/docker_cli_start_test.go | 1 + integration-cli/docker_cli_stats_test.go | 2 +- integration-cli/docker_cli_swarm_test.go | 1 + integration-cli/docker_cli_swarm_unix_test.go | 2 +- integration-cli/docker_cli_top_test.go | 2 +- integration-cli/docker_cli_update_unix_test.go | 2 +- integration-cli/docker_cli_userns_test.go | 2 +- integration-cli/docker_cli_v2_only_test.go | 2 +- integration-cli/docker_cli_volume_test.go | 1 + integration-cli/docker_deprecated_api_v124_test.go | 2 +- integration-cli/docker_deprecated_api_v124_unix_test.go | 2 +- integration-cli/docker_hub_pull_suite_test.go | 5 +++-- integration-cli/docker_utils_test.go | 1 + integration-cli/events_utils_test.go | 2 +- integration-cli/fixtures_linux_daemon_test.go | 2 +- integration-cli/utils_test.go | 2 +- pkg/discovery/discovery_test.go | 5 +++-- pkg/discovery/file/file_test.go | 5 ++--- pkg/discovery/generator_test.go | 5 +++-- pkg/discovery/kv/kv_test.go | 4 ++-- pkg/discovery/memory/memory_test.go | 4 ++-- pkg/discovery/nodes/nodes_test.go | 5 ++--- 98 files changed, 115 insertions(+), 71 deletions(-) diff --git a/integration-cli/benchmark_test.go b/integration-cli/benchmark_test.go index ed22684823..8fb9a7bd6f 100644 --- a/integration-cli/benchmark_test.go +++ b/integration-cli/benchmark_test.go @@ -7,8 +7,8 @@ import ( "runtime" "strings" "sync" + "testing" - "github.com/go-check/check" "gotest.tools/assert" ) diff --git a/integration-cli/check_test.go b/integration-cli/check_test.go index 41ee8a6079..135c998693 100644 --- a/integration-cli/check_test.go +++ b/integration-cli/check_test.go @@ -23,7 +23,6 @@ import ( "github.com/docker/docker/internal/test/fixtures/plugin" "github.com/docker/docker/internal/test/registry" "github.com/docker/docker/pkg/reexec" - "github.com/go-check/check" "gotest.tools/assert" ) diff --git a/integration-cli/daemon/daemon.go b/integration-cli/daemon/daemon.go index ca89f4d455..f2d2e062ab 100644 --- a/integration-cli/daemon/daemon.go +++ b/integration-cli/daemon/daemon.go @@ -3,6 +3,7 @@ package daemon // import "github.com/docker/docker/integration-cli/daemon" import ( "fmt" "strings" + "testing" "time" "github.com/docker/docker/internal/test/daemon" diff --git a/integration-cli/daemon/daemon_swarm.go b/integration-cli/daemon/daemon_swarm.go index 3e8ea4d19c..d545d091e4 100644 --- a/integration-cli/daemon/daemon_swarm.go +++ b/integration-cli/daemon/daemon_swarm.go @@ -4,6 +4,7 @@ import ( "context" "fmt" "strings" + "testing" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" diff --git a/integration-cli/daemon_swarm_hack_test.go b/integration-cli/daemon_swarm_hack_test.go index 5d3fbd294a..4152f735f7 100644 --- a/integration-cli/daemon_swarm_hack_test.go +++ b/integration-cli/daemon_swarm_hack_test.go @@ -1,8 +1,9 @@ package main import ( + "testing" + "github.com/docker/docker/integration-cli/daemon" - "github.com/go-check/check" ) func (s *DockerSwarmSuite) getDaemon(c *testing.T, nodeID string) *daemon.Daemon { diff --git a/integration-cli/docker_api_attach_test.go b/integration-cli/docker_api_attach_test.go index 7b4d7c72be..530823e0d3 100644 --- a/integration-cli/docker_api_attach_test.go +++ b/integration-cli/docker_api_attach_test.go @@ -10,13 +10,13 @@ import ( "net/http" "net/http/httputil" "strings" + "testing" "time" "github.com/docker/docker/api/types" "github.com/docker/docker/client" "github.com/docker/docker/internal/test/request" "github.com/docker/docker/pkg/stdcopy" - "github.com/go-check/check" "github.com/pkg/errors" "golang.org/x/net/websocket" "gotest.tools/assert" diff --git a/integration-cli/docker_api_build_test.go b/integration-cli/docker_api_build_test.go index 30b4540385..be96cb9df0 100644 --- a/integration-cli/docker_api_build_test.go +++ b/integration-cli/docker_api_build_test.go @@ -11,13 +11,13 @@ import ( "net/http" "regexp" "strings" + "testing" "github.com/docker/docker/api/types" "github.com/docker/docker/internal/test/fakecontext" "github.com/docker/docker/internal/test/fakegit" "github.com/docker/docker/internal/test/fakestorage" "github.com/docker/docker/internal/test/request" - "github.com/go-check/check" "gotest.tools/assert" is "gotest.tools/assert/cmp" ) diff --git a/integration-cli/docker_api_build_windows_test.go b/integration-cli/docker_api_build_windows_test.go index 1f3dd4710d..f19cc7a4e1 100644 --- a/integration-cli/docker_api_build_windows_test.go +++ b/integration-cli/docker_api_build_windows_test.go @@ -4,10 +4,10 @@ package main import ( "net/http" + "testing" "github.com/docker/docker/internal/test/fakecontext" "github.com/docker/docker/internal/test/request" - "github.com/go-check/check" "gotest.tools/assert" is "gotest.tools/assert/cmp" ) diff --git a/integration-cli/docker_api_containers_test.go b/integration-cli/docker_api_containers_test.go index 116c6a6a95..ec5312d2b7 100644 --- a/integration-cli/docker_api_containers_test.go +++ b/integration-cli/docker_api_containers_test.go @@ -14,6 +14,7 @@ import ( "regexp" "runtime" "strings" + "testing" "time" "github.com/docker/docker/api/types" diff --git a/integration-cli/docker_api_containers_windows_test.go b/integration-cli/docker_api_containers_windows_test.go index 8ddd31a1a9..8c2e96ce25 100644 --- a/integration-cli/docker_api_containers_windows_test.go +++ b/integration-cli/docker_api_containers_windows_test.go @@ -8,12 +8,12 @@ import ( "io/ioutil" "math/rand" "strings" + "testing" winio "github.com/Microsoft/go-winio" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/mount" - "github.com/go-check/check" "gotest.tools/assert" is "gotest.tools/assert/cmp" ) diff --git a/integration-cli/docker_api_exec_resize_test.go b/integration-cli/docker_api_exec_resize_test.go index 1fdab4755d..0781fbbb15 100644 --- a/integration-cli/docker_api_exec_resize_test.go +++ b/integration-cli/docker_api_exec_resize_test.go @@ -8,10 +8,10 @@ import ( "net/http" "strings" "sync" + "testing" "github.com/docker/docker/api/types/versions" "github.com/docker/docker/internal/test/request" - "github.com/go-check/check" "gotest.tools/assert" ) diff --git a/integration-cli/docker_api_exec_test.go b/integration-cli/docker_api_exec_test.go index 19f58e5232..8f52336dcf 100644 --- a/integration-cli/docker_api_exec_test.go +++ b/integration-cli/docker_api_exec_test.go @@ -9,6 +9,7 @@ import ( "net/http" "os" "strings" + "testing" "time" "github.com/docker/docker/api/types" diff --git a/integration-cli/docker_api_images_test.go b/integration-cli/docker_api_images_test.go index 1086b58deb..8f561c1d28 100644 --- a/integration-cli/docker_api_images_test.go +++ b/integration-cli/docker_api_images_test.go @@ -7,6 +7,7 @@ import ( "runtime" "strconv" "strings" + "testing" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" @@ -15,7 +16,6 @@ import ( "github.com/docker/docker/integration-cli/cli/build" "github.com/docker/docker/internal/test/request" "github.com/docker/docker/pkg/parsers/kernel" - "github.com/go-check/check" "gotest.tools/assert" ) diff --git a/integration-cli/docker_api_inspect_test.go b/integration-cli/docker_api_inspect_test.go index c3a1bffe78..3808e8e94d 100644 --- a/integration-cli/docker_api_inspect_test.go +++ b/integration-cli/docker_api_inspect_test.go @@ -4,11 +4,11 @@ import ( "context" "encoding/json" "strings" + "testing" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/versions/v1p20" "github.com/docker/docker/client" - "github.com/go-check/check" "gotest.tools/assert" is "gotest.tools/assert/cmp" ) diff --git a/integration-cli/docker_api_logs_test.go b/integration-cli/docker_api_logs_test.go index 1b7786f207..8a0d540f97 100644 --- a/integration-cli/docker_api_logs_test.go +++ b/integration-cli/docker_api_logs_test.go @@ -10,13 +10,13 @@ import ( "net/http" "strconv" "strings" + "testing" "time" "github.com/docker/docker/api/types" "github.com/docker/docker/client" "github.com/docker/docker/internal/test/request" "github.com/docker/docker/pkg/stdcopy" - "github.com/go-check/check" "gotest.tools/assert" ) diff --git a/integration-cli/docker_api_network_test.go b/integration-cli/docker_api_network_test.go index ab1d057aea..baa43d06b6 100644 --- a/integration-cli/docker_api_network_test.go +++ b/integration-cli/docker_api_network_test.go @@ -7,13 +7,13 @@ import ( "net/http" "net/url" "strings" + "testing" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/network" "github.com/docker/docker/api/types/versions" "github.com/docker/docker/internal/test/request" - "github.com/go-check/check" "gotest.tools/assert" ) diff --git a/integration-cli/docker_api_stats_test.go b/integration-cli/docker_api_stats_test.go index a2f668684f..3c04bdb3ff 100644 --- a/integration-cli/docker_api_stats_test.go +++ b/integration-cli/docker_api_stats_test.go @@ -10,13 +10,13 @@ import ( "strconv" "strings" "sync" + "testing" "time" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/versions" "github.com/docker/docker/client" "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 1a30539ae4..3e90d969f1 100644 --- a/integration-cli/docker_api_swarm_node_test.go +++ b/integration-cli/docker_api_swarm_node_test.go @@ -3,12 +3,14 @@ package main import ( + "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" ) func (s *DockerSwarmSuite) TestAPISwarmListNodes(c *testing.T) { diff --git a/integration-cli/docker_api_swarm_service_test.go b/integration-cli/docker_api_swarm_service_test.go index a633a906ca..69e15f5b48 100644 --- a/integration-cli/docker_api_swarm_service_test.go +++ b/integration-cli/docker_api_swarm_service_test.go @@ -7,6 +7,7 @@ import ( "fmt" "strconv" "strings" + "testing" "time" "github.com/docker/docker/api/types" diff --git a/integration-cli/docker_api_swarm_test.go b/integration-cli/docker_api_swarm_test.go index 40d5bb9832..56304d9ee7 100644 --- a/integration-cli/docker_api_swarm_test.go +++ b/integration-cli/docker_api_swarm_test.go @@ -12,6 +12,7 @@ import ( "runtime" "strings" "sync" + "testing" "time" "github.com/cloudflare/cfssl/csr" diff --git a/integration-cli/docker_api_test.go b/integration-cli/docker_api_test.go index d635413597..9ada07e615 100644 --- a/integration-cli/docker_api_test.go +++ b/integration-cli/docker_api_test.go @@ -7,11 +7,11 @@ import ( "runtime" "strconv" "strings" + "testing" "github.com/docker/docker/api" "github.com/docker/docker/api/types/versions" "github.com/docker/docker/internal/test/request" - "github.com/go-check/check" "gotest.tools/assert" ) diff --git a/integration-cli/docker_cli_attach_test.go b/integration-cli/docker_cli_attach_test.go index 3eaa116cde..b1ae40a72a 100644 --- a/integration-cli/docker_cli_attach_test.go +++ b/integration-cli/docker_cli_attach_test.go @@ -8,10 +8,10 @@ import ( "runtime" "strings" "sync" + "testing" "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_attach_unix_test.go b/integration-cli/docker_cli_attach_unix_test.go index 5d9dcd8d2b..1191b0265c 100644 --- a/integration-cli/docker_cli_attach_unix_test.go +++ b/integration-cli/docker_cli_attach_unix_test.go @@ -7,6 +7,7 @@ import ( "io/ioutil" "os/exec" "strings" + "testing" "time" "github.com/creack/pty" diff --git a/integration-cli/docker_cli_build_test.go b/integration-cli/docker_cli_build_test.go index 8ecfe3b086..86dd0ee563 100644 --- a/integration-cli/docker_cli_build_test.go +++ b/integration-cli/docker_cli_build_test.go @@ -13,6 +13,7 @@ import ( "runtime" "strconv" "strings" + "testing" "text/template" "time" diff --git a/integration-cli/docker_cli_build_unix_test.go b/integration-cli/docker_cli_build_unix_test.go index 30045d556d..5996a8ba52 100644 --- a/integration-cli/docker_cli_build_unix_test.go +++ b/integration-cli/docker_cli_build_unix_test.go @@ -13,9 +13,9 @@ import ( "regexp" "strings" "syscall" + "testing" "time" - "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/integration-cli/cli" "github.com/docker/docker/integration-cli/cli/build" "github.com/docker/docker/internal/test/fakecontext" diff --git a/integration-cli/docker_cli_by_digest_test.go b/integration-cli/docker_cli_by_digest_test.go index 84e81c457e..6a96c27f10 100644 --- a/integration-cli/docker_cli_by_digest_test.go +++ b/integration-cli/docker_cli_by_digest_test.go @@ -7,6 +7,7 @@ import ( "path/filepath" "regexp" "strings" + "testing" "github.com/docker/distribution/manifest/schema1" "github.com/docker/distribution/manifest/schema2" diff --git a/integration-cli/docker_cli_commit_test.go b/integration-cli/docker_cli_commit_test.go index 76ec7599f8..d9a2f3dcbb 100644 --- a/integration-cli/docker_cli_commit_test.go +++ b/integration-cli/docker_cli_commit_test.go @@ -2,11 +2,13 @@ package main import ( "strings" + "testing" "github.com/docker/docker/api/types/versions" "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/integration-cli/cli" "github.com/go-check/check" + "gotest.tools/assert" ) func (s *DockerSuite) TestCommitAfterContainerIsDone(c *testing.T) { diff --git a/integration-cli/docker_cli_cp_from_container_test.go b/integration-cli/docker_cli_cp_from_container_test.go index 5aa80d896e..bf885a09e0 100644 --- a/integration-cli/docker_cli_cp_from_container_test.go +++ b/integration-cli/docker_cli_cp_from_container_test.go @@ -3,8 +3,8 @@ package main import ( "os" "path/filepath" + "testing" - "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" "gotest.tools/assert" ) diff --git a/integration-cli/docker_cli_cp_test.go b/integration-cli/docker_cli_cp_test.go index d3bc81a80e..791138ed1a 100644 --- a/integration-cli/docker_cli_cp_test.go +++ b/integration-cli/docker_cli_cp_test.go @@ -9,8 +9,8 @@ import ( "path" "path/filepath" "strings" + "testing" - "github.com/go-check/check" "gotest.tools/assert" is "gotest.tools/assert/cmp" "gotest.tools/icmd" diff --git a/integration-cli/docker_cli_cp_to_container_test.go b/integration-cli/docker_cli_cp_to_container_test.go index 8cc1ab5a64..3a3e575f2f 100644 --- a/integration-cli/docker_cli_cp_to_container_test.go +++ b/integration-cli/docker_cli_cp_to_container_test.go @@ -2,8 +2,8 @@ package main import ( "os" + "testing" - "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" "gotest.tools/assert" ) diff --git a/integration-cli/docker_cli_cp_to_container_unix_test.go b/integration-cli/docker_cli_cp_to_container_unix_test.go index 6490c75126..9c1b8229b2 100644 --- a/integration-cli/docker_cli_cp_to_container_unix_test.go +++ b/integration-cli/docker_cli_cp_to_container_unix_test.go @@ -8,9 +8,9 @@ import ( "path/filepath" "strconv" "strings" + "testing" "github.com/docker/docker/pkg/system" - "github.com/go-check/check" "gotest.tools/assert" ) diff --git a/integration-cli/docker_cli_cp_utils_test.go b/integration-cli/docker_cli_cp_utils_test.go index b781709bd0..a7c317b86f 100644 --- a/integration-cli/docker_cli_cp_utils_test.go +++ b/integration-cli/docker_cli_cp_utils_test.go @@ -9,9 +9,9 @@ import ( "path/filepath" "runtime" "strings" + "testing" "github.com/docker/docker/pkg/archive" - "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 99b923b0d2..66ba9a36c1 100644 --- a/integration-cli/docker_cli_create_test.go +++ b/integration-cli/docker_cli_create_test.go @@ -6,6 +6,7 @@ import ( "os" "reflect" "strings" + "testing" "time" "github.com/docker/docker/integration-cli/checker" diff --git a/integration-cli/docker_cli_daemon_plugins_test.go b/integration-cli/docker_cli_daemon_plugins_test.go index 1ff9eaebbe..a581d948c1 100644 --- a/integration-cli/docker_cli_daemon_plugins_test.go +++ b/integration-cli/docker_cli_daemon_plugins_test.go @@ -4,9 +4,9 @@ package main import ( "strings" + "testing" "github.com/docker/docker/pkg/mount" - "github.com/go-check/check" "golang.org/x/sys/unix" "gotest.tools/assert" "gotest.tools/icmd" diff --git a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_cli_daemon_test.go index 32129212db..a463a2b1aa 100644 --- a/integration-cli/docker_cli_daemon_test.go +++ b/integration-cli/docker_cli_daemon_test.go @@ -21,6 +21,7 @@ import ( "strconv" "strings" "sync" + "testing" "time" "github.com/cloudflare/cfssl/helpers" diff --git a/integration-cli/docker_cli_events_test.go b/integration-cli/docker_cli_events_test.go index 9f611cdcbb..9e818afdae 100644 --- a/integration-cli/docker_cli_events_test.go +++ b/integration-cli/docker_cli_events_test.go @@ -11,6 +11,7 @@ import ( "os/exec" "strconv" "strings" + "testing" "time" "github.com/docker/docker/api/types" @@ -19,7 +20,6 @@ import ( eventstestutils "github.com/docker/docker/daemon/events/testutils" "github.com/docker/docker/integration-cli/cli" "github.com/docker/docker/integration-cli/cli/build" - "github.com/go-check/check" "gotest.tools/assert" is "gotest.tools/assert/cmp" "gotest.tools/icmd" diff --git a/integration-cli/docker_cli_events_unix_test.go b/integration-cli/docker_cli_events_unix_test.go index 04abed1ae3..26623102ec 100644 --- a/integration-cli/docker_cli_events_unix_test.go +++ b/integration-cli/docker_cli_events_unix_test.go @@ -10,12 +10,12 @@ import ( "os" "os/exec" "strings" + "testing" "time" "unicode" "github.com/creack/pty" "github.com/docker/docker/integration-cli/cli/build" - "github.com/go-check/check" "golang.org/x/sys/unix" "gotest.tools/assert" ) diff --git a/integration-cli/docker_cli_exec_test.go b/integration-cli/docker_cli_exec_test.go index 8c0954717a..673395159d 100644 --- a/integration-cli/docker_cli_exec_test.go +++ b/integration-cli/docker_cli_exec_test.go @@ -11,12 +11,12 @@ import ( "sort" "strings" "sync" + "testing" "time" "github.com/docker/docker/client" "github.com/docker/docker/integration-cli/cli" "github.com/docker/docker/integration-cli/cli/build" - "github.com/go-check/check" "gotest.tools/assert" is "gotest.tools/assert/cmp" "gotest.tools/icmd" diff --git a/integration-cli/docker_cli_exec_unix_test.go b/integration-cli/docker_cli_exec_unix_test.go index 1f145325b5..8def4eab0b 100644 --- a/integration-cli/docker_cli_exec_unix_test.go +++ b/integration-cli/docker_cli_exec_unix_test.go @@ -7,10 +7,10 @@ import ( "io" "os/exec" "strings" + "testing" "time" "github.com/creack/pty" - "github.com/go-check/check" "gotest.tools/assert" ) 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 b82bbd53cc..581d2f2cfd 100644 --- a/integration-cli/docker_cli_external_volume_driver_unix_test.go +++ b/integration-cli/docker_cli_external_volume_driver_unix_test.go @@ -13,6 +13,7 @@ import ( "os/exec" "path/filepath" "strings" + "testing" "time" "github.com/docker/docker/api/types" diff --git a/integration-cli/docker_cli_health_test.go b/integration-cli/docker_cli_health_test.go index 08073938e2..0300db7308 100644 --- a/integration-cli/docker_cli_health_test.go +++ b/integration-cli/docker_cli_health_test.go @@ -4,12 +4,12 @@ import ( "encoding/json" "strconv" "strings" + "testing" "time" "github.com/docker/docker/api/types" - "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/integration-cli/cli/build" - "github.com/go-check/check" + "gotest.tools/assert" ) func waitForHealthStatus(c *testing.T, name string, prev string, expected string) { diff --git a/integration-cli/docker_cli_history_test.go b/integration-cli/docker_cli_history_test.go index 7164a4f887..dd5a9cf612 100644 --- a/integration-cli/docker_cli_history_test.go +++ b/integration-cli/docker_cli_history_test.go @@ -5,10 +5,12 @@ import ( "regexp" "strconv" "strings" + "testing" "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/integration-cli/cli/build" "github.com/go-check/check" + "gotest.tools/assert" ) // This is a heisen-test. Because the created timestamp of images and the behavior of diff --git a/integration-cli/docker_cli_images_test.go b/integration-cli/docker_cli_images_test.go index 626cc50b14..c2c97c914b 100644 --- a/integration-cli/docker_cli_images_test.go +++ b/integration-cli/docker_cli_images_test.go @@ -8,6 +8,7 @@ import ( "reflect" "sort" "strings" + "testing" "time" "github.com/docker/docker/integration-cli/checker" diff --git a/integration-cli/docker_cli_import_test.go b/integration-cli/docker_cli_import_test.go index 8b3b5eda05..3895fb4745 100644 --- a/integration-cli/docker_cli_import_test.go +++ b/integration-cli/docker_cli_import_test.go @@ -8,8 +8,8 @@ import ( "os/exec" "regexp" "strings" + "testing" - "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/integration-cli/cli" "github.com/go-check/check" "gotest.tools/assert" diff --git a/integration-cli/docker_cli_info_test.go b/integration-cli/docker_cli_info_test.go index aac9e01768..73164d48d6 100644 --- a/integration-cli/docker_cli_info_test.go +++ b/integration-cli/docker_cli_info_test.go @@ -5,6 +5,7 @@ import ( "fmt" "net" "strings" + "testing" "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/integration-cli/daemon" diff --git a/integration-cli/docker_cli_info_unix_test.go b/integration-cli/docker_cli_info_unix_test.go index 8992a8d10b..221ed824ce 100644 --- a/integration-cli/docker_cli_info_unix_test.go +++ b/integration-cli/docker_cli_info_unix_test.go @@ -3,8 +3,10 @@ package main import ( + "testing" + "github.com/docker/docker/integration-cli/checker" - "github.com/go-check/check" + "gotest.tools/assert" ) func (s *DockerSuite) TestInfoSecurityOptions(c *testing.T) { diff --git a/integration-cli/docker_cli_inspect_test.go b/integration-cli/docker_cli_inspect_test.go index 65456d753d..c2198ceac8 100644 --- a/integration-cli/docker_cli_inspect_test.go +++ b/integration-cli/docker_cli_inspect_test.go @@ -6,6 +6,7 @@ import ( "os" "strconv" "strings" + "testing" "time" "github.com/docker/docker/api/types" diff --git a/integration-cli/docker_cli_links_test.go b/integration-cli/docker_cli_links_test.go index 221c447268..e29b677d69 100644 --- a/integration-cli/docker_cli_links_test.go +++ b/integration-cli/docker_cli_links_test.go @@ -6,6 +6,7 @@ import ( "regexp" "sort" "strings" + "testing" "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/runconfig" diff --git a/integration-cli/docker_cli_login_test.go b/integration-cli/docker_cli_login_test.go index d68e94dc0a..c189d1150e 100644 --- a/integration-cli/docker_cli_login_test.go +++ b/integration-cli/docker_cli_login_test.go @@ -4,8 +4,8 @@ import ( "bytes" "os/exec" "strings" + "testing" - "github.com/go-check/check" "gotest.tools/assert" ) diff --git a/integration-cli/docker_cli_logout_test.go b/integration-cli/docker_cli_logout_test.go index 45f7570987..f6b65682b3 100644 --- a/integration-cli/docker_cli_logout_test.go +++ b/integration-cli/docker_cli_logout_test.go @@ -8,8 +8,8 @@ import ( "os/exec" "path/filepath" "strings" + "testing" - "github.com/go-check/check" "gotest.tools/assert" ) diff --git a/integration-cli/docker_cli_logs_bench_test.go b/integration-cli/docker_cli_logs_bench_test.go index 4008260331..4702b2a4b9 100644 --- a/integration-cli/docker_cli_logs_bench_test.go +++ b/integration-cli/docker_cli_logs_bench_test.go @@ -3,9 +3,8 @@ package main import ( "fmt" "strings" + "testing" "time" - - "github.com/go-check/check" ) func (s *DockerSuite) BenchmarkLogsCLIRotateFollow(c *testing.B) { diff --git a/integration-cli/docker_cli_logs_test.go b/integration-cli/docker_cli_logs_test.go index db0a33da13..fcb7ac99e6 100644 --- a/integration-cli/docker_cli_logs_test.go +++ b/integration-cli/docker_cli_logs_test.go @@ -6,11 +6,11 @@ import ( "os/exec" "regexp" "strings" + "testing" "time" "github.com/docker/docker/integration-cli/cli" "github.com/docker/docker/pkg/jsonmessage" - "github.com/go-check/check" "gotest.tools/assert" "gotest.tools/icmd" ) diff --git a/integration-cli/docker_cli_netmode_test.go b/integration-cli/docker_cli_netmode_test.go index b0fc4617e2..a0df62cb8b 100644 --- a/integration-cli/docker_cli_netmode_test.go +++ b/integration-cli/docker_cli_netmode_test.go @@ -2,10 +2,12 @@ package main import ( "strings" + "testing" "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/runconfig" "github.com/go-check/check" + "gotest.tools/assert" ) // GH14530. Validates combinations of --net= with other options diff --git a/integration-cli/docker_cli_network_unix_test.go b/integration-cli/docker_cli_network_unix_test.go index 808fac1272..5a0ecc2deb 100644 --- a/integration-cli/docker_cli_network_unix_test.go +++ b/integration-cli/docker_cli_network_unix_test.go @@ -11,6 +11,7 @@ import ( "net/http/httptest" "os" "strings" + "testing" "time" "github.com/docker/docker/api/types" diff --git a/integration-cli/docker_cli_plugins_logdriver_test.go b/integration-cli/docker_cli_plugins_logdriver_test.go index f165900c1a..5c4520258b 100644 --- a/integration-cli/docker_cli_plugins_logdriver_test.go +++ b/integration-cli/docker_cli_plugins_logdriver_test.go @@ -3,9 +3,9 @@ package main import ( "context" "strings" + "testing" "github.com/docker/docker/client" - "github.com/go-check/check" "gotest.tools/assert" ) diff --git a/integration-cli/docker_cli_plugins_test.go b/integration-cli/docker_cli_plugins_test.go index 58fca9a891..b2ffbec42e 100644 --- a/integration-cli/docker_cli_plugins_test.go +++ b/integration-cli/docker_cli_plugins_test.go @@ -9,6 +9,7 @@ import ( "path" "path/filepath" "strings" + "testing" "time" "github.com/docker/docker/api/types" diff --git a/integration-cli/docker_cli_port_test.go b/integration-cli/docker_cli_port_test.go index 9cd0fe7093..75502e1702 100644 --- a/integration-cli/docker_cli_port_test.go +++ b/integration-cli/docker_cli_port_test.go @@ -7,6 +7,7 @@ import ( "sort" "strconv" "strings" + "testing" "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" diff --git a/integration-cli/docker_cli_proxy_test.go b/integration-cli/docker_cli_proxy_test.go index 2149ed03c5..f45acbe9b1 100644 --- a/integration-cli/docker_cli_proxy_test.go +++ b/integration-cli/docker_cli_proxy_test.go @@ -3,8 +3,8 @@ package main import ( "net" "strings" + "testing" - "github.com/go-check/check" "gotest.tools/assert" "gotest.tools/icmd" ) diff --git a/integration-cli/docker_cli_prune_unix_test.go b/integration-cli/docker_cli_prune_unix_test.go index 9e6abf5488..70ab27e25a 100644 --- a/integration-cli/docker_cli_prune_unix_test.go +++ b/integration-cli/docker_cli_prune_unix_test.go @@ -8,6 +8,7 @@ import ( "path/filepath" "strconv" "strings" + "testing" "time" "github.com/docker/docker/integration-cli/checker" diff --git a/integration-cli/docker_cli_ps_test.go b/integration-cli/docker_cli_ps_test.go index b7d93d16ec..51a50ac0a0 100644 --- a/integration-cli/docker_cli_ps_test.go +++ b/integration-cli/docker_cli_ps_test.go @@ -5,6 +5,7 @@ import ( "sort" "strconv" "strings" + "testing" "time" "github.com/docker/docker/api/types/versions" diff --git a/integration-cli/docker_cli_pull_local_test.go b/integration-cli/docker_cli_pull_local_test.go index 192013c3bd..402d1a68e3 100644 --- a/integration-cli/docker_cli_pull_local_test.go +++ b/integration-cli/docker_cli_pull_local_test.go @@ -8,6 +8,7 @@ import ( "path/filepath" "runtime" "strings" + "testing" "github.com/docker/distribution" "github.com/docker/distribution/manifest" diff --git a/integration-cli/docker_cli_pull_test.go b/integration-cli/docker_cli_pull_test.go index e7f80b2526..81f5b1fb87 100644 --- a/integration-cli/docker_cli_pull_test.go +++ b/integration-cli/docker_cli_pull_test.go @@ -5,9 +5,9 @@ import ( "regexp" "strings" "sync" + "testing" "time" - "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_push_test.go b/integration-cli/docker_cli_push_test.go index 5c3c8aa035..53369c273c 100644 --- a/integration-cli/docker_cli_push_test.go +++ b/integration-cli/docker_cli_push_test.go @@ -9,10 +9,10 @@ import ( "os" "strings" "sync" + "testing" "github.com/docker/distribution/reference" "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_registry_user_agent_test.go b/integration-cli/docker_cli_registry_user_agent_test.go index 8dc825cc94..c03fcb0be9 100644 --- a/integration-cli/docker_cli_registry_user_agent_test.go +++ b/integration-cli/docker_cli_registry_user_agent_test.go @@ -6,9 +6,9 @@ import ( "net/http" "os" "regexp" + "testing" "github.com/docker/docker/internal/test/registry" - "github.com/go-check/check" "gotest.tools/assert" ) diff --git a/integration-cli/docker_cli_restart_test.go b/integration-cli/docker_cli_restart_test.go index d2e15dda0c..4190584d8e 100644 --- a/integration-cli/docker_cli_restart_test.go +++ b/integration-cli/docker_cli_restart_test.go @@ -4,6 +4,7 @@ import ( "os" "strconv" "strings" + "testing" "time" "github.com/docker/docker/integration-cli/checker" diff --git a/integration-cli/docker_cli_rmi_test.go b/integration-cli/docker_cli_rmi_test.go index 5842ee765d..3080265ada 100644 --- a/integration-cli/docker_cli_rmi_test.go +++ b/integration-cli/docker_cli_rmi_test.go @@ -3,6 +3,7 @@ package main import ( "fmt" "strings" + "testing" "time" "github.com/docker/docker/integration-cli/checker" diff --git a/integration-cli/docker_cli_run_test.go b/integration-cli/docker_cli_run_test.go index 0a260fb869..9fbfee1701 100644 --- a/integration-cli/docker_cli_run_test.go +++ b/integration-cli/docker_cli_run_test.go @@ -20,6 +20,7 @@ import ( "strconv" "strings" "sync" + "testing" "time" "github.com/docker/docker/client" diff --git a/integration-cli/docker_cli_run_unix_test.go b/integration-cli/docker_cli_run_unix_test.go index d0cccf817b..fd4185d06b 100644 --- a/integration-cli/docker_cli_run_unix_test.go +++ b/integration-cli/docker_cli_run_unix_test.go @@ -15,6 +15,7 @@ import ( "strconv" "strings" "syscall" + "testing" "time" "github.com/creack/pty" diff --git a/integration-cli/docker_cli_save_load_test.go b/integration-cli/docker_cli_save_load_test.go index 354fe1ad69..e3187fda75 100644 --- a/integration-cli/docker_cli_save_load_test.go +++ b/integration-cli/docker_cli_save_load_test.go @@ -13,6 +13,7 @@ import ( "regexp" "sort" "strings" + "testing" "time" "github.com/docker/docker/integration-cli/checker" diff --git a/integration-cli/docker_cli_save_load_unix_test.go b/integration-cli/docker_cli_save_load_unix_test.go index 2bdd127a4e..c1dfa012d8 100644 --- a/integration-cli/docker_cli_save_load_unix_test.go +++ b/integration-cli/docker_cli_save_load_unix_test.go @@ -9,11 +9,11 @@ import ( "os" "os/exec" "strings" + "testing" "time" "github.com/creack/pty" "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_search_test.go b/integration-cli/docker_cli_search_test.go index c68c1ea8c9..a029c95c4b 100644 --- a/integration-cli/docker_cli_search_test.go +++ b/integration-cli/docker_cli_search_test.go @@ -3,8 +3,8 @@ package main import ( "fmt" "strings" + "testing" - "github.com/go-check/check" "gotest.tools/assert" ) diff --git a/integration-cli/docker_cli_service_create_test.go b/integration-cli/docker_cli_service_create_test.go index 860d0658db..6530a51ea5 100644 --- a/integration-cli/docker_cli_service_create_test.go +++ b/integration-cli/docker_cli_service_create_test.go @@ -7,6 +7,7 @@ import ( "fmt" "path/filepath" "strings" + "testing" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/mount" diff --git a/integration-cli/docker_cli_service_health_test.go b/integration-cli/docker_cli_service_health_test.go index de17a10dcb..a120f70922 100644 --- a/integration-cli/docker_cli_service_health_test.go +++ b/integration-cli/docker_cli_service_health_test.go @@ -5,6 +5,7 @@ package main import ( "strconv" "strings" + "testing" "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/daemon/cluster/executor/container" diff --git a/integration-cli/docker_cli_service_logs_test.go b/integration-cli/docker_cli_service_logs_test.go index 95a050ad2c..faf94a41dd 100644 --- a/integration-cli/docker_cli_service_logs_test.go +++ b/integration-cli/docker_cli_service_logs_test.go @@ -8,6 +8,7 @@ import ( "io" "os/exec" "strings" + "testing" "time" "github.com/docker/docker/integration-cli/checker" diff --git a/integration-cli/docker_cli_service_scale_test.go b/integration-cli/docker_cli_service_scale_test.go index f8259de8de..931127589a 100644 --- a/integration-cli/docker_cli_service_scale_test.go +++ b/integration-cli/docker_cli_service_scale_test.go @@ -5,8 +5,8 @@ package main import ( "fmt" "strings" + "testing" - "github.com/go-check/check" "gotest.tools/assert" ) diff --git a/integration-cli/docker_cli_sni_test.go b/integration-cli/docker_cli_sni_test.go index ca27ba236b..173547149b 100644 --- a/integration-cli/docker_cli_sni_test.go +++ b/integration-cli/docker_cli_sni_test.go @@ -9,8 +9,8 @@ import ( "net/url" "os/exec" "strings" + "testing" - "github.com/go-check/check" "gotest.tools/assert" ) diff --git a/integration-cli/docker_cli_start_test.go b/integration-cli/docker_cli_start_test.go index bfc42ebba9..00a1fbf787 100644 --- a/integration-cli/docker_cli_start_test.go +++ b/integration-cli/docker_cli_start_test.go @@ -3,6 +3,7 @@ package main import ( "fmt" "strings" + "testing" "time" "github.com/docker/docker/integration-cli/checker" diff --git a/integration-cli/docker_cli_stats_test.go b/integration-cli/docker_cli_stats_test.go index adc4bb96de..71966e5718 100644 --- a/integration-cli/docker_cli_stats_test.go +++ b/integration-cli/docker_cli_stats_test.go @@ -5,10 +5,10 @@ import ( "os/exec" "regexp" "strings" + "testing" "time" "github.com/docker/docker/integration-cli/cli" - "github.com/go-check/check" "gotest.tools/assert" is "gotest.tools/assert/cmp" ) diff --git a/integration-cli/docker_cli_swarm_test.go b/integration-cli/docker_cli_swarm_test.go index bacd3c5d78..e2f6db6368 100644 --- a/integration-cli/docker_cli_swarm_test.go +++ b/integration-cli/docker_cli_swarm_test.go @@ -15,6 +15,7 @@ import ( "path/filepath" "runtime" "strings" + "testing" "time" "github.com/cloudflare/cfssl/helpers" diff --git a/integration-cli/docker_cli_swarm_unix_test.go b/integration-cli/docker_cli_swarm_unix_test.go index eb85b8708a..e2678188ba 100644 --- a/integration-cli/docker_cli_swarm_unix_test.go +++ b/integration-cli/docker_cli_swarm_unix_test.go @@ -5,11 +5,11 @@ package main import ( "encoding/json" "strings" + "testing" "time" "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_top_test.go b/integration-cli/docker_cli_top_test.go index b85a91adcd..219f9b0e26 100644 --- a/integration-cli/docker_cli_top_test.go +++ b/integration-cli/docker_cli_top_test.go @@ -2,8 +2,8 @@ package main import ( "strings" + "testing" - "github.com/go-check/check" "gotest.tools/assert" "gotest.tools/icmd" ) diff --git a/integration-cli/docker_cli_update_unix_test.go b/integration-cli/docker_cli_update_unix_test.go index ad52634992..a02e154b66 100644 --- a/integration-cli/docker_cli_update_unix_test.go +++ b/integration-cli/docker_cli_update_unix_test.go @@ -8,6 +8,7 @@ import ( "fmt" "os/exec" "strings" + "testing" "time" "github.com/creack/pty" @@ -15,7 +16,6 @@ import ( "github.com/docker/docker/client" "github.com/docker/docker/internal/test/request" "github.com/docker/docker/pkg/parsers/kernel" - "github.com/go-check/check" "gotest.tools/assert" ) diff --git a/integration-cli/docker_cli_userns_test.go b/integration-cli/docker_cli_userns_test.go index c2d1a4f733..4ff72b4486 100644 --- a/integration-cli/docker_cli_userns_test.go +++ b/integration-cli/docker_cli_userns_test.go @@ -11,8 +11,8 @@ import ( "path/filepath" "strconv" "strings" + "testing" - "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/pkg/stringid" "github.com/docker/docker/pkg/system" "github.com/go-check/check" diff --git a/integration-cli/docker_cli_v2_only_test.go b/integration-cli/docker_cli_v2_only_test.go index f51686e7b7..299ea5079d 100644 --- a/integration-cli/docker_cli_v2_only_test.go +++ b/integration-cli/docker_cli_v2_only_test.go @@ -5,9 +5,9 @@ import ( "io/ioutil" "net/http" "os" + "testing" "github.com/docker/docker/internal/test/registry" - "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 8ef5b84f59..67858c684b 100644 --- a/integration-cli/docker_cli_volume_test.go +++ b/integration-cli/docker_cli_volume_test.go @@ -8,6 +8,7 @@ import ( "os/exec" "path/filepath" "strings" + "testing" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/mount" diff --git a/integration-cli/docker_deprecated_api_v124_test.go b/integration-cli/docker_deprecated_api_v124_test.go index 6f92db4460..b11e3644fa 100644 --- a/integration-cli/docker_deprecated_api_v124_test.go +++ b/integration-cli/docker_deprecated_api_v124_test.go @@ -6,10 +6,10 @@ package main import ( "net/http" "strings" + "testing" "github.com/docker/docker/api/types/versions" "github.com/docker/docker/internal/test/request" - "github.com/go-check/check" "gotest.tools/assert" is "gotest.tools/assert/cmp" ) diff --git a/integration-cli/docker_deprecated_api_v124_unix_test.go b/integration-cli/docker_deprecated_api_v124_unix_test.go index 135f101323..06959ebf08 100644 --- a/integration-cli/docker_deprecated_api_v124_unix_test.go +++ b/integration-cli/docker_deprecated_api_v124_unix_test.go @@ -4,9 +4,9 @@ package main import ( "strings" + "testing" "github.com/docker/docker/internal/test/request" - "github.com/go-check/check" "gotest.tools/assert" ) diff --git a/integration-cli/docker_hub_pull_suite_test.go b/integration-cli/docker_hub_pull_suite_test.go index f1d229a887..8742cd4d27 100644 --- a/integration-cli/docker_hub_pull_suite_test.go +++ b/integration-cli/docker_hub_pull_suite_test.go @@ -4,18 +4,19 @@ import ( "os/exec" "runtime" "strings" + "testing" - "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/integration-cli/daemon" testdaemon "github.com/docker/docker/internal/test/daemon" "github.com/go-check/check" + "gotest.tools/assert" ) func init() { // FIXME. Temporarily turning this off for Windows as GH16039 was breaking // Windows to Linux CI @icecrime if runtime.GOOS != "windows" { - /*check.Suite(newDockerHubPullSuite())*/ + /*check.Suite(newDockerHubPullSuite())*/ } } diff --git a/integration-cli/docker_utils_test.go b/integration-cli/docker_utils_test.go index 89d387bfd8..4e833961e3 100644 --- a/integration-cli/docker_utils_test.go +++ b/integration-cli/docker_utils_test.go @@ -12,6 +12,7 @@ import ( "path/filepath" "strconv" "strings" + "testing" "time" "github.com/docker/docker/api/types" diff --git a/integration-cli/events_utils_test.go b/integration-cli/events_utils_test.go index b89b446b1d..0bd923d148 100644 --- a/integration-cli/events_utils_test.go +++ b/integration-cli/events_utils_test.go @@ -8,9 +8,9 @@ import ( "regexp" "strconv" "strings" + "testing" eventstestutils "github.com/docker/docker/daemon/events/testutils" - "github.com/go-check/check" "github.com/sirupsen/logrus" "gotest.tools/assert" ) diff --git a/integration-cli/fixtures_linux_daemon_test.go b/integration-cli/fixtures_linux_daemon_test.go index f17a0284f3..de401b9dbc 100644 --- a/integration-cli/fixtures_linux_daemon_test.go +++ b/integration-cli/fixtures_linux_daemon_test.go @@ -8,9 +8,9 @@ import ( "path/filepath" "runtime" "strings" + "testing" "github.com/docker/docker/internal/test/fixtures/load" - "github.com/go-check/check" "gotest.tools/assert" ) diff --git a/integration-cli/utils_test.go b/integration-cli/utils_test.go index 867467726c..9746f6c873 100644 --- a/integration-cli/utils_test.go +++ b/integration-cli/utils_test.go @@ -6,9 +6,9 @@ import ( "os/exec" "path/filepath" "strings" + "testing" "github.com/docker/docker/internal/testutil" - "github.com/go-check/check" "github.com/pkg/errors" "gotest.tools/icmd" ) diff --git a/pkg/discovery/discovery_test.go b/pkg/discovery/discovery_test.go index d17fa254d3..3dbc31c2a9 100644 --- a/pkg/discovery/discovery_test.go +++ b/pkg/discovery/discovery_test.go @@ -3,7 +3,8 @@ package discovery // import "github.com/docker/docker/pkg/discovery" import ( "testing" - "github.com/go-check/check" + "github.com/docker/docker/integration-cli/checker" + "gotest.tools/assert" ) // Hook up gocheck into the "go test" runner. @@ -11,7 +12,7 @@ func Test(t *testing.T) { /*check.TestingT(t)*/ } type DiscoverySuite struct{} - /*check.Suite(&DiscoverySuite{})*/ +/*check.Suite(&DiscoverySuite{})*/ func (s *DiscoverySuite) TestNewEntry(c *testing.T) { entry, err := NewEntry("127.0.0.1:2375") diff --git a/pkg/discovery/file/file_test.go b/pkg/discovery/file/file_test.go index 38fd4868ae..f896bfd39f 100644 --- a/pkg/discovery/file/file_test.go +++ b/pkg/discovery/file/file_test.go @@ -6,8 +6,7 @@ import ( "testing" "github.com/docker/docker/pkg/discovery" - - "github.com/go-check/check" + "gotest.tools/assert" ) // Hook up gocheck into the "go test" runner. @@ -15,7 +14,7 @@ func Test(t *testing.T) { /*check.TestingT(t)*/ } type DiscoverySuite struct{} - /*check.Suite(&DiscoverySuite{})*/ +/*check.Suite(&DiscoverySuite{})*/ func (s *DiscoverySuite) TestInitialize(c *testing.T) { d := &Discovery{} diff --git a/pkg/discovery/generator_test.go b/pkg/discovery/generator_test.go index 55f40a6b0e..bfc8fb0f9d 100644 --- a/pkg/discovery/generator_test.go +++ b/pkg/discovery/generator_test.go @@ -1,7 +1,8 @@ package discovery // import "github.com/docker/docker/pkg/discovery" - import ( - "github.com/go-check/check" + "testing" + + "gotest.tools/assert" ) func (s *DiscoverySuite) TestGeneratorNotGenerate(c *testing.T) { diff --git a/pkg/discovery/kv/kv_test.go b/pkg/discovery/kv/kv_test.go index d5c5324025..34d58fdb9d 100644 --- a/pkg/discovery/kv/kv_test.go +++ b/pkg/discovery/kv/kv_test.go @@ -11,7 +11,7 @@ import ( "github.com/docker/docker/pkg/discovery" "github.com/docker/libkv" "github.com/docker/libkv/store" - "github.com/go-check/check" + "gotest.tools/assert" ) // Hook up gocheck into the "go test" runner. @@ -19,7 +19,7 @@ func Test(t *testing.T) { /*check.TestingT(t)*/ } type DiscoverySuite struct{} - /*check.Suite(&DiscoverySuite{})*/ +/*check.Suite(&DiscoverySuite{})*/ func (ds *DiscoverySuite) TestInitialize(c *testing.T) { storeMock := &FakeStore{ diff --git a/pkg/discovery/memory/memory_test.go b/pkg/discovery/memory/memory_test.go index 67c55c3af4..099a443c2f 100644 --- a/pkg/discovery/memory/memory_test.go +++ b/pkg/discovery/memory/memory_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/docker/docker/pkg/discovery" - "github.com/go-check/check" + "gotest.tools/assert" ) // Hook up gocheck into the "go test" runner. @@ -12,7 +12,7 @@ func Test(t *testing.T) { /*check.TestingT(t)*/ } type discoverySuite struct{} - /*check.Suite(&discoverySuite{})*/ +/*check.Suite(&discoverySuite{})*/ func (s *discoverySuite) TestWatch(c *testing.T) { d := &Discovery{} diff --git a/pkg/discovery/nodes/nodes_test.go b/pkg/discovery/nodes/nodes_test.go index abc2a75fbe..efb0c67d4a 100644 --- a/pkg/discovery/nodes/nodes_test.go +++ b/pkg/discovery/nodes/nodes_test.go @@ -4,8 +4,7 @@ import ( "testing" "github.com/docker/docker/pkg/discovery" - - "github.com/go-check/check" + "gotest.tools/assert" ) // Hook up gocheck into the "go test" runner. @@ -13,7 +12,7 @@ func Test(t *testing.T) { /*check.TestingT(t)*/ } type DiscoverySuite struct{} - /*check.Suite(&DiscoverySuite{})*/ +/*check.Suite(&DiscoverySuite{})*/ func (s *DiscoverySuite) TestInitialize(c *testing.T) { d := &Discovery{}