From ee905da6e199593023eec102b965a192ff1c3044 Mon Sep 17 00:00:00 2001 From: Paul Tagliamonte Date: Tue, 12 Jul 2016 15:46:35 +0100 Subject: [PATCH] check-v1 Gbp-Pq: Name check-v1.patch --- integration-cli/benchmark_test.go | 2 +- integration-cli/check_test.go | 2 +- integration-cli/daemon.go | 2 +- integration-cli/docker_api_attach_test.go | 2 +- integration-cli/docker_api_auth_test.go | 2 +- integration-cli/docker_api_build_test.go | 2 +- integration-cli/docker_api_containers_test.go | 2 +- integration-cli/docker_api_create_test.go | 2 +- integration-cli/docker_api_events_test.go | 2 +- integration-cli/docker_api_exec_resize_test.go | 2 +- integration-cli/docker_api_exec_test.go | 2 +- integration-cli/docker_api_images_test.go | 2 +- integration-cli/docker_api_info_test.go | 2 +- integration-cli/docker_api_inspect_test.go | 2 +- integration-cli/docker_api_inspect_unix_test.go | 2 +- integration-cli/docker_api_logs_test.go | 2 +- integration-cli/docker_api_network_test.go | 2 +- integration-cli/docker_api_resize_test.go | 2 +- integration-cli/docker_api_stats_test.go | 2 +- integration-cli/docker_api_test.go | 2 +- integration-cli/docker_api_update_unix_test.go | 2 +- integration-cli/docker_api_version_test.go | 2 +- integration-cli/docker_api_volumes_test.go | 2 +- integration-cli/docker_cli_attach_test.go | 2 +- integration-cli/docker_cli_attach_unix_test.go | 2 +- integration-cli/docker_cli_authz_unix_test.go | 2 +- integration-cli/docker_cli_build_test.go | 2 +- integration-cli/docker_cli_build_unix_test.go | 2 +- integration-cli/docker_cli_by_digest_test.go | 2 +- integration-cli/docker_cli_commit_test.go | 2 +- integration-cli/docker_cli_config_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.go | 2 +- integration-cli/docker_cli_create_test.go | 2 +- integration-cli/docker_cli_daemon_experimental_test.go | 2 +- integration-cli/docker_cli_daemon_not_experimental_test.go | 2 +- integration-cli/docker_cli_daemon_test.go | 2 +- integration-cli/docker_cli_diff_test.go | 2 +- 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 +- integration-cli/docker_cli_experimental_test.go | 2 +- integration-cli/docker_cli_export_import_test.go | 2 +- integration-cli/docker_cli_external_graphdriver_unix_test.go | 2 +- integration-cli/docker_cli_help_test.go | 2 +- integration-cli/docker_cli_history_test.go | 2 +- integration-cli/docker_cli_images_test.go | 2 +- integration-cli/docker_cli_import_test.go | 2 +- integration-cli/docker_cli_info_test.go | 2 +- integration-cli/docker_cli_inspect_experimental_test.go | 2 +- integration-cli/docker_cli_inspect_test.go | 2 +- integration-cli/docker_cli_kill_test.go | 2 +- integration-cli/docker_cli_links_test.go | 2 +- integration-cli/docker_cli_links_unix_test.go | 2 +- integration-cli/docker_cli_login_test.go | 2 +- integration-cli/docker_cli_logout_test.go | 2 +- integration-cli/docker_cli_logs_bench_test.go | 2 +- integration-cli/docker_cli_logs_test.go | 2 +- integration-cli/docker_cli_nat_test.go | 2 +- integration-cli/docker_cli_netmode_test.go | 2 +- integration-cli/docker_cli_network_unix_test.go | 2 +- integration-cli/docker_cli_oom_killed_test.go | 2 +- integration-cli/docker_cli_pause_test.go | 2 +- integration-cli/docker_cli_port_test.go | 2 +- integration-cli/docker_cli_proxy_test.go | 2 +- integration-cli/docker_cli_ps_test.go | 2 +- integration-cli/docker_cli_pull_local_test.go | 2 +- integration-cli/docker_cli_pull_test.go | 2 +- integration-cli/docker_cli_pull_trusted_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_rename_test.go | 2 +- integration-cli/docker_cli_restart_test.go | 2 +- integration-cli/docker_cli_rm_test.go | 2 +- integration-cli/docker_cli_rmi_test.go | 2 +- integration-cli/docker_cli_run_test.go | 2 +- integration-cli/docker_cli_run_unix_test.go | 2 +- integration-cli/docker_cli_save_load_test.go | 2 +- integration-cli/docker_cli_save_load_unix_test.go | 2 +- integration-cli/docker_cli_search_test.go | 2 +- integration-cli/docker_cli_sni_test.go | 2 +- integration-cli/docker_cli_start_test.go | 2 +- integration-cli/docker_cli_start_volume_driver_unix_test.go | 2 +- integration-cli/docker_cli_stats_test.go | 2 +- integration-cli/docker_cli_tag_test.go | 2 +- integration-cli/docker_cli_top_test.go | 2 +- integration-cli/docker_cli_update_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_version_test.go | 2 +- integration-cli/docker_cli_volume_test.go | 2 +- integration-cli/docker_cli_wait_test.go | 2 +- integration-cli/docker_experimental_network_test.go | 2 +- integration-cli/docker_hub_pull_suite_test.go | 2 +- integration-cli/docker_utils.go | 2 +- integration-cli/events_utils.go | 2 +- integration-cli/registry.go | 2 +- integration-cli/registry_mock.go | 2 +- integration-cli/requirements.go | 2 +- integration-cli/trust_server.go | 2 +- pkg/discovery/discovery_test.go | 2 +- pkg/discovery/file/file_test.go | 2 +- pkg/discovery/generator_test.go | 2 +- pkg/discovery/kv/kv_test.go | 2 +- pkg/discovery/memory/memory_test.go | 2 +- pkg/discovery/nodes/nodes_test.go | 2 +- pkg/integration/checker/checker.go | 2 +- pkg/integration/dockerCmd_utils.go | 2 +- pkg/integration/dockerCmd_utils_test.go | 2 +- 114 files changed, 114 insertions(+), 114 deletions(-) diff --git a/integration-cli/benchmark_test.go b/integration-cli/benchmark_test.go index 647d014d..3398305e 100644 --- a/integration-cli/benchmark_test.go +++ b/integration-cli/benchmark_test.go @@ -9,7 +9,7 @@ import ( "sync" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) BenchmarkConcurrentContainerActions(c *check.C) { diff --git a/integration-cli/check_test.go b/integration-cli/check_test.go index aab8e4a7..971ac31f 100644 --- a/integration-cli/check_test.go +++ b/integration-cli/check_test.go @@ -8,7 +8,7 @@ import ( "github.com/docker/docker/cliconfig" "github.com/docker/docker/pkg/reexec" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func Test(t *testing.T) { diff --git a/integration-cli/daemon.go b/integration-cli/daemon.go index 2e3985af..f6f5f55e 100644 --- a/integration-cli/daemon.go +++ b/integration-cli/daemon.go @@ -18,7 +18,7 @@ import ( "github.com/docker/docker/pkg/ioutils" "github.com/docker/docker/pkg/tlsconfig" "github.com/docker/go-connections/sockets" - "github.com/go-check/check" + "gopkg.in/check.v1" ) // Daemon represents a Docker daemon for the testing framework. diff --git a/integration-cli/docker_api_attach_test.go b/integration-cli/docker_api_attach_test.go index a0a8e7d6..620f5a92 100644 --- a/integration-cli/docker_api_attach_test.go +++ b/integration-cli/docker_api_attach_test.go @@ -9,7 +9,7 @@ import ( "time" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" "golang.org/x/net/websocket" ) diff --git a/integration-cli/docker_api_auth_test.go b/integration-cli/docker_api_auth_test.go index 63e78ab5..64450640 100644 --- a/integration-cli/docker_api_auth_test.go +++ b/integration-cli/docker_api_auth_test.go @@ -5,7 +5,7 @@ import ( "github.com/docker/docker/pkg/integration/checker" "github.com/docker/engine-api/types" - "github.com/go-check/check" + "gopkg.in/check.v1" ) // Test case for #22244 diff --git a/integration-cli/docker_api_build_test.go b/integration-cli/docker_api_build_test.go index 49de71c9..71329006 100644 --- a/integration-cli/docker_api_build_test.go +++ b/integration-cli/docker_api_build_test.go @@ -6,7 +6,7 @@ import ( "net/http" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestBuildApiDockerfilePath(c *check.C) { diff --git a/integration-cli/docker_api_containers_test.go b/integration-cli/docker_api_containers_test.go index 2622a544..2249ed15 100644 --- a/integration-cli/docker_api_containers_test.go +++ b/integration-cli/docker_api_containers_test.go @@ -21,7 +21,7 @@ import ( "github.com/docker/engine-api/types" containertypes "github.com/docker/engine-api/types/container" networktypes "github.com/docker/engine-api/types/network" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestContainerApiGetAll(c *check.C) { diff --git a/integration-cli/docker_api_create_test.go b/integration-cli/docker_api_create_test.go index d29b3550..727d971e 100644 --- a/integration-cli/docker_api_create_test.go +++ b/integration-cli/docker_api_create_test.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestApiCreateWithNotExistImage(c *check.C) { diff --git a/integration-cli/docker_api_events_test.go b/integration-cli/docker_api_events_test.go index cb219fbc..b5a6a308 100644 --- a/integration-cli/docker_api_events_test.go +++ b/integration-cli/docker_api_events_test.go @@ -11,7 +11,7 @@ import ( "github.com/docker/docker/pkg/integration/checker" "github.com/docker/docker/pkg/jsonmessage" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestEventsApiEmptyOutput(c *check.C) { diff --git a/integration-cli/docker_api_exec_resize_test.go b/integration-cli/docker_api_exec_resize_test.go index 2c0c8766..cf56a42a 100644 --- a/integration-cli/docker_api_exec_resize_test.go +++ b/integration-cli/docker_api_exec_resize_test.go @@ -10,7 +10,7 @@ import ( "sync" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestExecResizeApiHeightWidthNoInt(c *check.C) { diff --git a/integration-cli/docker_api_exec_test.go b/integration-cli/docker_api_exec_test.go index f16582f4..c8729abc 100644 --- a/integration-cli/docker_api_exec_test.go +++ b/integration-cli/docker_api_exec_test.go @@ -11,7 +11,7 @@ import ( "time" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" ) // Regression test for #9414 diff --git a/integration-cli/docker_api_images_test.go b/integration-cli/docker_api_images_test.go index 9d35b0c9..0bee32c1 100644 --- a/integration-cli/docker_api_images_test.go +++ b/integration-cli/docker_api_images_test.go @@ -8,7 +8,7 @@ import ( "github.com/docker/docker/pkg/integration/checker" "github.com/docker/engine-api/types" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestApiImagesFilter(c *check.C) { diff --git a/integration-cli/docker_api_info_test.go b/integration-cli/docker_api_info_test.go index 9e6af66e..a154c153 100644 --- a/integration-cli/docker_api_info_test.go +++ b/integration-cli/docker_api_info_test.go @@ -4,7 +4,7 @@ import ( "net/http" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestInfoApi(c *check.C) { diff --git a/integration-cli/docker_api_inspect_test.go b/integration-cli/docker_api_inspect_test.go index 6b55159a..e4a2421f 100644 --- a/integration-cli/docker_api_inspect_test.go +++ b/integration-cli/docker_api_inspect_test.go @@ -9,7 +9,7 @@ import ( "github.com/docker/docker/pkg/stringutils" "github.com/docker/engine-api/types" "github.com/docker/engine-api/types/versions/v1p20" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestInspectApiContainerResponse(c *check.C) { diff --git a/integration-cli/docker_api_inspect_unix_test.go b/integration-cli/docker_api_inspect_unix_test.go index fe59860d..5a9c8a37 100644 --- a/integration-cli/docker_api_inspect_unix_test.go +++ b/integration-cli/docker_api_inspect_unix_test.go @@ -8,7 +8,7 @@ import ( "net/http" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" ) // #16665 diff --git a/integration-cli/docker_api_logs_test.go b/integration-cli/docker_api_logs_test.go index 2ff27f8e..c71b1cff 100644 --- a/integration-cli/docker_api_logs_test.go +++ b/integration-cli/docker_api_logs_test.go @@ -9,7 +9,7 @@ import ( "time" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestLogsApiWithStdout(c *check.C) { diff --git a/integration-cli/docker_api_network_test.go b/integration-cli/docker_api_network_test.go index e65c7b5e..967a7d26 100644 --- a/integration-cli/docker_api_network_test.go +++ b/integration-cli/docker_api_network_test.go @@ -12,7 +12,7 @@ import ( "github.com/docker/engine-api/types" "github.com/docker/engine-api/types/filters" "github.com/docker/engine-api/types/network" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestApiNetworkGetDefaults(c *check.C) { diff --git a/integration-cli/docker_api_resize_test.go b/integration-cli/docker_api_resize_test.go index 73023dd2..9466e71d 100644 --- a/integration-cli/docker_api_resize_test.go +++ b/integration-cli/docker_api_resize_test.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestResizeApiResponse(c *check.C) { diff --git a/integration-cli/docker_api_stats_test.go b/integration-cli/docker_api_stats_test.go index 7c3f8d39..40082d65 100644 --- a/integration-cli/docker_api_stats_test.go +++ b/integration-cli/docker_api_stats_test.go @@ -13,7 +13,7 @@ import ( "github.com/docker/docker/pkg/integration/checker" "github.com/docker/docker/pkg/version" "github.com/docker/engine-api/types" - "github.com/go-check/check" + "gopkg.in/check.v1" ) var expectedNetworkInterfaceStats = strings.Split("rx_bytes rx_dropped rx_errors rx_packets tx_bytes tx_dropped tx_errors tx_packets", " ") diff --git a/integration-cli/docker_api_test.go b/integration-cli/docker_api_test.go index a7257779..cb22bb8d 100644 --- a/integration-cli/docker_api_test.go +++ b/integration-cli/docker_api_test.go @@ -12,7 +12,7 @@ import ( "github.com/docker/docker/api" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestApiOptionsRoute(c *check.C) { diff --git a/integration-cli/docker_api_update_unix_test.go b/integration-cli/docker_api_update_unix_test.go index 607e76a4..a5b69baf 100644 --- a/integration-cli/docker_api_update_unix_test.go +++ b/integration-cli/docker_api_update_unix_test.go @@ -6,7 +6,7 @@ import ( "strings" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestApiUpdateContainer(c *check.C) { diff --git a/integration-cli/docker_api_version_test.go b/integration-cli/docker_api_version_test.go index ccb14841..d71a6bb2 100644 --- a/integration-cli/docker_api_version_test.go +++ b/integration-cli/docker_api_version_test.go @@ -7,7 +7,7 @@ import ( "github.com/docker/docker/dockerversion" "github.com/docker/docker/pkg/integration/checker" "github.com/docker/engine-api/types" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestGetVersion(c *check.C) { diff --git a/integration-cli/docker_api_volumes_test.go b/integration-cli/docker_api_volumes_test.go index 732271d0..d4ed266f 100644 --- a/integration-cli/docker_api_volumes_test.go +++ b/integration-cli/docker_api_volumes_test.go @@ -7,7 +7,7 @@ import ( "github.com/docker/docker/pkg/integration/checker" "github.com/docker/engine-api/types" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestVolumesApiList(c *check.C) { diff --git a/integration-cli/docker_cli_attach_test.go b/integration-cli/docker_cli_attach_test.go index 0ac3e1ac..91934ad9 100644 --- a/integration-cli/docker_cli_attach_test.go +++ b/integration-cli/docker_cli_attach_test.go @@ -10,7 +10,7 @@ import ( "time" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" ) const attachWait = 5 * time.Second diff --git a/integration-cli/docker_cli_attach_unix_test.go b/integration-cli/docker_cli_attach_unix_test.go index 7af761d7..b5eab253 100644 --- a/integration-cli/docker_cli_attach_unix_test.go +++ b/integration-cli/docker_cli_attach_unix_test.go @@ -10,7 +10,7 @@ import ( "github.com/docker/docker/pkg/integration/checker" "github.com/docker/docker/pkg/stringid" - "github.com/go-check/check" + "gopkg.in/check.v1" "github.com/kr/pty" ) diff --git a/integration-cli/docker_cli_authz_unix_test.go b/integration-cli/docker_cli_authz_unix_test.go index 0a208d75..ee469b8d 100644 --- a/integration-cli/docker_cli_authz_unix_test.go +++ b/integration-cli/docker_cli_authz_unix_test.go @@ -20,7 +20,7 @@ import ( "github.com/docker/docker/pkg/authorization" "github.com/docker/docker/pkg/integration/checker" "github.com/docker/docker/pkg/plugins" - "github.com/go-check/check" + "gopkg.in/check.v1" ) const ( diff --git a/integration-cli/docker_cli_build_test.go b/integration-cli/docker_cli_build_test.go index a53df642..e759574b 100644 --- a/integration-cli/docker_cli_build_test.go +++ b/integration-cli/docker_cli_build_test.go @@ -21,7 +21,7 @@ import ( "github.com/docker/docker/pkg/archive" "github.com/docker/docker/pkg/integration/checker" "github.com/docker/docker/pkg/stringutils" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestBuildJSONEmptyRun(c *check.C) { diff --git a/integration-cli/docker_cli_build_unix_test.go b/integration-cli/docker_cli_build_unix_test.go index 56ab66ef..179eef21 100644 --- a/integration-cli/docker_cli_build_unix_test.go +++ b/integration-cli/docker_cli_build_unix_test.go @@ -16,7 +16,7 @@ import ( "github.com/docker/docker/pkg/integration/checker" "github.com/docker/go-units" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestBuildResourceConstraintsAreUsed(c *check.C) { diff --git a/integration-cli/docker_cli_by_digest_test.go b/integration-cli/docker_cli_by_digest_test.go index f3948d67..713d4099 100644 --- a/integration-cli/docker_cli_by_digest_test.go +++ b/integration-cli/docker_cli_by_digest_test.go @@ -14,7 +14,7 @@ import ( "github.com/docker/docker/pkg/integration/checker" "github.com/docker/docker/pkg/stringutils" "github.com/docker/engine-api/types" - "github.com/go-check/check" + "gopkg.in/check.v1" ) var ( diff --git a/integration-cli/docker_cli_commit_test.go b/integration-cli/docker_cli_commit_test.go index 086a2031..42fc2d5a 100644 --- a/integration-cli/docker_cli_commit_test.go +++ b/integration-cli/docker_cli_commit_test.go @@ -4,7 +4,7 @@ import ( "strings" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestCommitAfterContainerIsDone(c *check.C) { diff --git a/integration-cli/docker_cli_config_test.go b/integration-cli/docker_cli_config_test.go index 60152310..568954b6 100644 --- a/integration-cli/docker_cli_config_test.go +++ b/integration-cli/docker_cli_config_test.go @@ -12,7 +12,7 @@ import ( "github.com/docker/docker/dockerversion" "github.com/docker/docker/pkg/homedir" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestConfigHttpHeader(c *check.C) { diff --git a/integration-cli/docker_cli_cp_from_container_test.go b/integration-cli/docker_cli_cp_from_container_test.go index 677085a1..470b4989 100644 --- a/integration-cli/docker_cli_cp_from_container_test.go +++ b/integration-cli/docker_cli_cp_from_container_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" ) // docker cp CONTAINER:PATH LOCALPATH diff --git a/integration-cli/docker_cli_cp_test.go b/integration-cli/docker_cli_cp_test.go index f1ae7607..d4de7124 100644 --- a/integration-cli/docker_cli_cp_test.go +++ b/integration-cli/docker_cli_cp_test.go @@ -11,7 +11,7 @@ import ( "strings" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" ) const ( diff --git a/integration-cli/docker_cli_cp_to_container_test.go b/integration-cli/docker_cli_cp_to_container_test.go index 63fbd446..1170cb6f 100644 --- a/integration-cli/docker_cli_cp_to_container_test.go +++ b/integration-cli/docker_cli_cp_to_container_test.go @@ -4,7 +4,7 @@ import ( "os" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" ) // docker cp LOCALPATH CONTAINER:PATH 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 45d85ba5..be4fac26 100644 --- a/integration-cli/docker_cli_cp_to_container_unix_test.go +++ b/integration-cli/docker_cli_cp_to_container_unix_test.go @@ -9,7 +9,7 @@ import ( "github.com/docker/docker/pkg/integration/checker" "github.com/docker/docker/pkg/system" - "github.com/go-check/check" + "gopkg.in/check.v1" ) // Check ownership is root, both in non-userns and userns enabled modes diff --git a/integration-cli/docker_cli_cp_utils.go b/integration-cli/docker_cli_cp_utils.go index 0501c5d7..6da0da91 100644 --- a/integration-cli/docker_cli_cp_utils.go +++ b/integration-cli/docker_cli_cp_utils.go @@ -11,7 +11,7 @@ import ( "github.com/docker/docker/pkg/archive" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" ) type fileType uint32 diff --git a/integration-cli/docker_cli_create_test.go b/integration-cli/docker_cli_create_test.go index a22bb3ec..5e72d197 100644 --- a/integration-cli/docker_cli_create_test.go +++ b/integration-cli/docker_cli_create_test.go @@ -15,7 +15,7 @@ import ( "github.com/docker/docker/pkg/integration/checker" "github.com/docker/docker/pkg/stringid" "github.com/docker/go-connections/nat" - "github.com/go-check/check" + "gopkg.in/check.v1" ) // Make sure we can create a simple container with some args diff --git a/integration-cli/docker_cli_daemon_experimental_test.go b/integration-cli/docker_cli_daemon_experimental_test.go index fea887d7..0e3829d6 100644 --- a/integration-cli/docker_cli_daemon_experimental_test.go +++ b/integration-cli/docker_cli_daemon_experimental_test.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/go-check/check" + "gopkg.in/check.v1" ) // TestDaemonRestartWithKilledRunningContainer requires live restore of running containers diff --git a/integration-cli/docker_cli_daemon_not_experimental_test.go b/integration-cli/docker_cli_daemon_not_experimental_test.go index 8c5634cc..584e0335 100644 --- a/integration-cli/docker_cli_daemon_not_experimental_test.go +++ b/integration-cli/docker_cli_daemon_not_experimental_test.go @@ -7,7 +7,7 @@ import ( "os" "strings" - "github.com/go-check/check" + "gopkg.in/check.v1" ) // os.Kill should kill daemon ungracefully, leaving behind container mounts. diff --git a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_cli_daemon_test.go index 348653bf..abcc5f72 100644 --- a/integration-cli/docker_cli_daemon_test.go +++ b/integration-cli/docker_cli_daemon_test.go @@ -25,7 +25,7 @@ import ( "github.com/docker/go-units" "github.com/docker/libnetwork/iptables" "github.com/docker/libtrust" - "github.com/go-check/check" + "gopkg.in/check.v1" "github.com/kr/pty" ) diff --git a/integration-cli/docker_cli_diff_test.go b/integration-cli/docker_cli_diff_test.go index e0d0914f..797f576d 100644 --- a/integration-cli/docker_cli_diff_test.go +++ b/integration-cli/docker_cli_diff_test.go @@ -4,7 +4,7 @@ import ( "strings" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" ) // ensure that an added file shows up in docker diff diff --git a/integration-cli/docker_cli_events_test.go b/integration-cli/docker_cli_events_test.go index f17b711c..11906078 100644 --- a/integration-cli/docker_cli_events_test.go +++ b/integration-cli/docker_cli_events_test.go @@ -14,7 +14,7 @@ import ( "github.com/docker/docker/daemon/events/testutils" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestEventsTimestampFormats(c *check.C) { diff --git a/integration-cli/docker_cli_events_unix_test.go b/integration-cli/docker_cli_events_unix_test.go index c5e48f21..ca8cf1b9 100644 --- a/integration-cli/docker_cli_events_unix_test.go +++ b/integration-cli/docker_cli_events_unix_test.go @@ -13,7 +13,7 @@ import ( "unicode" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" "github.com/kr/pty" ) diff --git a/integration-cli/docker_cli_exec_test.go b/integration-cli/docker_cli_exec_test.go index a8150ad2..007b1a26 100644 --- a/integration-cli/docker_cli_exec_test.go +++ b/integration-cli/docker_cli_exec_test.go @@ -15,7 +15,7 @@ import ( "time" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestExec(c *check.C) { diff --git a/integration-cli/docker_cli_exec_unix_test.go b/integration-cli/docker_cli_exec_unix_test.go index 42db4091..a063afa2 100644 --- a/integration-cli/docker_cli_exec_unix_test.go +++ b/integration-cli/docker_cli_exec_unix_test.go @@ -10,7 +10,7 @@ import ( "time" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" "github.com/kr/pty" ) diff --git a/integration-cli/docker_cli_experimental_test.go b/integration-cli/docker_cli_experimental_test.go index 8795078f..c7476cc1 100644 --- a/integration-cli/docker_cli_experimental_test.go +++ b/integration-cli/docker_cli_experimental_test.go @@ -4,7 +4,7 @@ package main import ( "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" "strings" ) diff --git a/integration-cli/docker_cli_export_import_test.go b/integration-cli/docker_cli_export_import_test.go index 069dc081..59c79e56 100644 --- a/integration-cli/docker_cli_export_import_test.go +++ b/integration-cli/docker_cli_export_import_test.go @@ -6,7 +6,7 @@ import ( "strings" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" ) // export an image and try to import it into a new one diff --git a/integration-cli/docker_cli_external_graphdriver_unix_test.go b/integration-cli/docker_cli_external_graphdriver_unix_test.go index 33fe4058..316bc543 100644 --- a/integration-cli/docker_cli_external_graphdriver_unix_test.go +++ b/integration-cli/docker_cli_external_graphdriver_unix_test.go @@ -17,7 +17,7 @@ import ( "github.com/docker/docker/daemon/graphdriver/vfs" "github.com/docker/docker/pkg/archive" "github.com/docker/docker/pkg/plugins" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func init() { diff --git a/integration-cli/docker_cli_help_test.go b/integration-cli/docker_cli_help_test.go index 93ccbeb8..123115ed 100644 --- a/integration-cli/docker_cli_help_test.go +++ b/integration-cli/docker_cli_help_test.go @@ -8,7 +8,7 @@ import ( "github.com/docker/docker/pkg/homedir" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestHelpTextVerify(c *check.C) { diff --git a/integration-cli/docker_cli_history_test.go b/integration-cli/docker_cli_history_test.go index 0ee1c46b..b700020b 100644 --- a/integration-cli/docker_cli_history_test.go +++ b/integration-cli/docker_cli_history_test.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" ) // 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 dbceddf1..9720618c 100644 --- a/integration-cli/docker_cli_images_test.go +++ b/integration-cli/docker_cli_images_test.go @@ -12,7 +12,7 @@ import ( "github.com/docker/docker/pkg/integration/checker" "github.com/docker/docker/pkg/stringid" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestImagesEnsureImageIsListed(c *check.C) { diff --git a/integration-cli/docker_cli_import_test.go b/integration-cli/docker_cli_import_test.go index 9420dafa..0e33a4ed 100644 --- a/integration-cli/docker_cli_import_test.go +++ b/integration-cli/docker_cli_import_test.go @@ -10,7 +10,7 @@ import ( "strings" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestImportDisplay(c *check.C) { diff --git a/integration-cli/docker_cli_info_test.go b/integration-cli/docker_cli_info_test.go index dd236945..4a545f1d 100644 --- a/integration-cli/docker_cli_info_test.go +++ b/integration-cli/docker_cli_info_test.go @@ -7,7 +7,7 @@ import ( "github.com/docker/docker/pkg/integration/checker" "github.com/docker/docker/utils" - "github.com/go-check/check" + "gopkg.in/check.v1" ) // ensure docker info succeeds diff --git a/integration-cli/docker_cli_inspect_experimental_test.go b/integration-cli/docker_cli_inspect_experimental_test.go index 0d9a261d..2fb1649a 100644 --- a/integration-cli/docker_cli_inspect_experimental_test.go +++ b/integration-cli/docker_cli_inspect_experimental_test.go @@ -5,7 +5,7 @@ package main import ( "github.com/docker/docker/pkg/integration/checker" "github.com/docker/engine-api/types" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestInspectNamedMountPoint(c *check.C) { diff --git a/integration-cli/docker_cli_inspect_test.go b/integration-cli/docker_cli_inspect_test.go index 29614537..4b008599 100644 --- a/integration-cli/docker_cli_inspect_test.go +++ b/integration-cli/docker_cli_inspect_test.go @@ -11,7 +11,7 @@ import ( "github.com/docker/docker/pkg/integration/checker" "github.com/docker/engine-api/types" "github.com/docker/engine-api/types/container" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func checkValidGraphDriver(c *check.C, name string) { diff --git a/integration-cli/docker_cli_kill_test.go b/integration-cli/docker_cli_kill_test.go index 05d9a558..5091fc07 100644 --- a/integration-cli/docker_cli_kill_test.go +++ b/integration-cli/docker_cli_kill_test.go @@ -6,7 +6,7 @@ import ( "strings" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestKillContainer(c *check.C) { diff --git a/integration-cli/docker_cli_links_test.go b/integration-cli/docker_cli_links_test.go index 322b58c6..5f43d2d6 100644 --- a/integration-cli/docker_cli_links_test.go +++ b/integration-cli/docker_cli_links_test.go @@ -7,7 +7,7 @@ import ( "github.com/docker/docker/pkg/integration/checker" "github.com/docker/docker/runconfig" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestLinksPingUnlinkedContainers(c *check.C) { diff --git a/integration-cli/docker_cli_links_unix_test.go b/integration-cli/docker_cli_links_unix_test.go index 1af92793..a5f7d9e6 100644 --- a/integration-cli/docker_cli_links_unix_test.go +++ b/integration-cli/docker_cli_links_unix_test.go @@ -7,7 +7,7 @@ import ( "os" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestLinksEtcHostsContentMatch(c *check.C) { diff --git a/integration-cli/docker_cli_login_test.go b/integration-cli/docker_cli_login_test.go index 01de75d9..d5bbe9f5 100644 --- a/integration-cli/docker_cli_login_test.go +++ b/integration-cli/docker_cli_login_test.go @@ -5,7 +5,7 @@ import ( "os/exec" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestLoginWithoutTTY(c *check.C) { diff --git a/integration-cli/docker_cli_logout_test.go b/integration-cli/docker_cli_logout_test.go index 6658da54..87c5f5ca 100644 --- a/integration-cli/docker_cli_logout_test.go +++ b/integration-cli/docker_cli_logout_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerRegistryAuthHtpasswdSuite) TestLogoutWithExternalAuth(c *check.C) { diff --git a/integration-cli/docker_cli_logs_bench_test.go b/integration-cli/docker_cli_logs_bench_test.go index eeb008de..c05dd719 100644 --- a/integration-cli/docker_cli_logs_bench_test.go +++ b/integration-cli/docker_cli_logs_bench_test.go @@ -5,7 +5,7 @@ import ( "strings" "time" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) BenchmarkLogsCLIRotateFollow(c *check.C) { diff --git a/integration-cli/docker_cli_logs_test.go b/integration-cli/docker_cli_logs_test.go index e18916db..a6f08ad9 100644 --- a/integration-cli/docker_cli_logs_test.go +++ b/integration-cli/docker_cli_logs_test.go @@ -10,7 +10,7 @@ import ( "github.com/docker/docker/pkg/integration/checker" "github.com/docker/docker/pkg/jsonlog" - "github.com/go-check/check" + "gopkg.in/check.v1" ) // This used to work, it test a log of PageSize-1 (gh#4851) diff --git a/integration-cli/docker_cli_nat_test.go b/integration-cli/docker_cli_nat_test.go index 7f4cc2cb..45496d3f 100644 --- a/integration-cli/docker_cli_nat_test.go +++ b/integration-cli/docker_cli_nat_test.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func startServerContainer(c *check.C, msg string, port int) string { diff --git a/integration-cli/docker_cli_netmode_test.go b/integration-cli/docker_cli_netmode_test.go index 142f192d..8266711e 100644 --- a/integration-cli/docker_cli_netmode_test.go +++ b/integration-cli/docker_cli_netmode_test.go @@ -3,7 +3,7 @@ package main import ( "github.com/docker/docker/pkg/integration/checker" "github.com/docker/docker/runconfig" - "github.com/go-check/check" + "gopkg.in/check.v1" ) // 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 902766d0..c5ef2224 100644 --- a/integration-cli/docker_cli_network_unix_test.go +++ b/integration-cli/docker_cli_network_unix_test.go @@ -22,7 +22,7 @@ import ( "github.com/docker/libnetwork/ipamapi" remoteipam "github.com/docker/libnetwork/ipams/remote/api" "github.com/docker/libnetwork/netlabel" - "github.com/go-check/check" + "gopkg.in/check.v1" "github.com/vishvananda/netlink" ) diff --git a/integration-cli/docker_cli_oom_killed_test.go b/integration-cli/docker_cli_oom_killed_test.go index ff77f572..01c85645 100644 --- a/integration-cli/docker_cli_oom_killed_test.go +++ b/integration-cli/docker_cli_oom_killed_test.go @@ -4,7 +4,7 @@ package main import ( "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestInspectOomKilledTrue(c *check.C) { diff --git a/integration-cli/docker_cli_pause_test.go b/integration-cli/docker_cli_pause_test.go index a42c2f54..f12baae0 100644 --- a/integration-cli/docker_cli_pause_test.go +++ b/integration-cli/docker_cli_pause_test.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestPause(c *check.C) { diff --git a/integration-cli/docker_cli_port_test.go b/integration-cli/docker_cli_port_test.go index 80b00fe9..68ca3f8a 100644 --- a/integration-cli/docker_cli_port_test.go +++ b/integration-cli/docker_cli_port_test.go @@ -8,7 +8,7 @@ import ( "strings" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestPortList(c *check.C) { diff --git a/integration-cli/docker_cli_proxy_test.go b/integration-cli/docker_cli_proxy_test.go index e5699ca5..9a131ed8 100644 --- a/integration-cli/docker_cli_proxy_test.go +++ b/integration-cli/docker_cli_proxy_test.go @@ -6,7 +6,7 @@ import ( "strings" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestCliProxyDisableProxyUnixSock(c *check.C) { diff --git a/integration-cli/docker_cli_ps_test.go b/integration-cli/docker_cli_ps_test.go index 72650ff2..c2e7b781 100644 --- a/integration-cli/docker_cli_ps_test.go +++ b/integration-cli/docker_cli_ps_test.go @@ -13,7 +13,7 @@ import ( "github.com/docker/docker/pkg/integration/checker" "github.com/docker/docker/pkg/stringid" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestPsListContainersBase(c *check.C) { diff --git a/integration-cli/docker_cli_pull_local_test.go b/integration-cli/docker_cli_pull_local_test.go index 1f858320..b96d9d5f 100644 --- a/integration-cli/docker_cli_pull_local_test.go +++ b/integration-cli/docker_cli_pull_local_test.go @@ -16,7 +16,7 @@ import ( "github.com/docker/distribution/manifest/manifestlist" "github.com/docker/distribution/manifest/schema2" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" ) // testPullImageWithAliases pulls a specific image tag and verifies that any aliases (i.e., other diff --git a/integration-cli/docker_cli_pull_test.go b/integration-cli/docker_cli_pull_test.go index ac211d25..81a8bbb7 100644 --- a/integration-cli/docker_cli_pull_test.go +++ b/integration-cli/docker_cli_pull_test.go @@ -9,7 +9,7 @@ import ( "github.com/docker/distribution/digest" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" ) // TestPullFromCentralRegistry pulls an image from the central registry and verifies that the client diff --git a/integration-cli/docker_cli_pull_trusted_test.go b/integration-cli/docker_cli_pull_trusted_test.go index 6bc38e69..25e628f8 100644 --- a/integration-cli/docker_cli_pull_trusted_test.go +++ b/integration-cli/docker_cli_pull_trusted_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerTrustSuite) TestTrustedPull(c *check.C) { diff --git a/integration-cli/docker_cli_push_test.go b/integration-cli/docker_cli_push_test.go index 6b3d8232..8bf9cea1 100644 --- a/integration-cli/docker_cli_push_test.go +++ b/integration-cli/docker_cli_push_test.go @@ -15,7 +15,7 @@ import ( "github.com/docker/distribution/digest" "github.com/docker/docker/cliconfig" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" ) // Pushing an image to a private registry. diff --git a/integration-cli/docker_cli_registry_user_agent_test.go b/integration-cli/docker_cli_registry_user_agent_test.go index 67a950ca..5ab294c6 100644 --- a/integration-cli/docker_cli_registry_user_agent_test.go +++ b/integration-cli/docker_cli_registry_user_agent_test.go @@ -5,7 +5,7 @@ import ( "net/http" "regexp" - "github.com/go-check/check" + "gopkg.in/check.v1" ) // unescapeBackslashSemicolonParens unescapes \;() diff --git a/integration-cli/docker_cli_rename_test.go b/integration-cli/docker_cli_rename_test.go index cbb60f85..1c3dfa73 100644 --- a/integration-cli/docker_cli_rename_test.go +++ b/integration-cli/docker_cli_rename_test.go @@ -5,7 +5,7 @@ import ( "github.com/docker/docker/pkg/integration/checker" "github.com/docker/docker/pkg/stringid" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestRenameStoppedContainer(c *check.C) { diff --git a/integration-cli/docker_cli_restart_test.go b/integration-cli/docker_cli_restart_test.go index 31c89203..7bca2675 100644 --- a/integration-cli/docker_cli_restart_test.go +++ b/integration-cli/docker_cli_restart_test.go @@ -7,7 +7,7 @@ import ( "time" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestRestartStoppedContainer(c *check.C) { diff --git a/integration-cli/docker_cli_rm_test.go b/integration-cli/docker_cli_rm_test.go index 0186c567..73c56588 100644 --- a/integration-cli/docker_cli_rm_test.go +++ b/integration-cli/docker_cli_rm_test.go @@ -5,7 +5,7 @@ import ( "os" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestRmContainerWithRemovedVolume(c *check.C) { diff --git a/integration-cli/docker_cli_rmi_test.go b/integration-cli/docker_cli_rmi_test.go index 697be326..c251d514 100644 --- a/integration-cli/docker_cli_rmi_test.go +++ b/integration-cli/docker_cli_rmi_test.go @@ -8,7 +8,7 @@ import ( "github.com/docker/docker/pkg/integration/checker" "github.com/docker/docker/pkg/stringid" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestRmiWithContainerFails(c *check.C) { diff --git a/integration-cli/docker_cli_run_test.go b/integration-cli/docker_cli_run_test.go index 6e45fca9..eee0d94b 100644 --- a/integration-cli/docker_cli_run_test.go +++ b/integration-cli/docker_cli_run_test.go @@ -25,7 +25,7 @@ import ( "github.com/docker/go-connections/nat" "github.com/docker/libnetwork/netutils" "github.com/docker/libnetwork/resolvconf" - "github.com/go-check/check" + "gopkg.in/check.v1" libcontainerUser "github.com/opencontainers/runc/libcontainer/user" ) diff --git a/integration-cli/docker_cli_run_unix_test.go b/integration-cli/docker_cli_run_unix_test.go index fe7cc697..9ddac61e 100644 --- a/integration-cli/docker_cli_run_unix_test.go +++ b/integration-cli/docker_cli_run_unix_test.go @@ -21,7 +21,7 @@ import ( "github.com/docker/docker/pkg/mount" "github.com/docker/docker/pkg/parsers" "github.com/docker/docker/pkg/sysinfo" - "github.com/go-check/check" + "gopkg.in/check.v1" "github.com/kr/pty" ) diff --git a/integration-cli/docker_cli_save_load_test.go b/integration-cli/docker_cli_save_load_test.go index b21c987b..2dd31064 100644 --- a/integration-cli/docker_cli_save_load_test.go +++ b/integration-cli/docker_cli_save_load_test.go @@ -15,7 +15,7 @@ import ( "github.com/docker/distribution/digest" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" ) // save a repo using gz compression and try to load it using stdout diff --git a/integration-cli/docker_cli_save_load_unix_test.go b/integration-cli/docker_cli_save_load_unix_test.go index d9dd95f1..5cdba85d 100644 --- a/integration-cli/docker_cli_save_load_unix_test.go +++ b/integration-cli/docker_cli_save_load_unix_test.go @@ -10,7 +10,7 @@ import ( "strings" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" "github.com/kr/pty" ) diff --git a/integration-cli/docker_cli_search_test.go b/integration-cli/docker_cli_search_test.go index dfab8104..f7a988b5 100644 --- a/integration-cli/docker_cli_search_test.go +++ b/integration-cli/docker_cli_search_test.go @@ -4,7 +4,7 @@ import ( "strings" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" ) // search for repos named "registry" on the central registry diff --git a/integration-cli/docker_cli_sni_test.go b/integration-cli/docker_cli_sni_test.go index fb896d52..cba8d976 100644 --- a/integration-cli/docker_cli_sni_test.go +++ b/integration-cli/docker_cli_sni_test.go @@ -10,7 +10,7 @@ import ( "os/exec" "strings" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestClientSetsTLSServerName(c *check.C) { diff --git a/integration-cli/docker_cli_start_test.go b/integration-cli/docker_cli_start_test.go index 43342191..aedfd4d3 100644 --- a/integration-cli/docker_cli_start_test.go +++ b/integration-cli/docker_cli_start_test.go @@ -6,7 +6,7 @@ import ( "time" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" ) // Regression test for https://github.com/docker/docker/issues/7843 diff --git a/integration-cli/docker_cli_start_volume_driver_unix_test.go b/integration-cli/docker_cli_start_volume_driver_unix_test.go index cc5d0b11..c511cf07 100644 --- a/integration-cli/docker_cli_start_volume_driver_unix_test.go +++ b/integration-cli/docker_cli_start_volume_driver_unix_test.go @@ -17,7 +17,7 @@ import ( "github.com/docker/docker/pkg/integration/checker" "github.com/docker/engine-api/types" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func init() { diff --git a/integration-cli/docker_cli_stats_test.go b/integration-cli/docker_cli_stats_test.go index e3c7a3e2..97861e22 100644 --- a/integration-cli/docker_cli_stats_test.go +++ b/integration-cli/docker_cli_stats_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestStatsNoStream(c *check.C) { diff --git a/integration-cli/docker_cli_tag_test.go b/integration-cli/docker_cli_tag_test.go index 1e601527..e290999d 100644 --- a/integration-cli/docker_cli_tag_test.go +++ b/integration-cli/docker_cli_tag_test.go @@ -7,7 +7,7 @@ import ( "github.com/docker/docker/pkg/integration/checker" "github.com/docker/docker/pkg/stringid" "github.com/docker/docker/pkg/stringutils" - "github.com/go-check/check" + "gopkg.in/check.v1" ) // tagging a named image in a new unprefixed repo should work diff --git a/integration-cli/docker_cli_top_test.go b/integration-cli/docker_cli_top_test.go index e0865b92..3cf9acea 100644 --- a/integration-cli/docker_cli_top_test.go +++ b/integration-cli/docker_cli_top_test.go @@ -4,7 +4,7 @@ import ( "strings" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestTopMultipleArgs(c *check.C) { diff --git a/integration-cli/docker_cli_update_test.go b/integration-cli/docker_cli_update_test.go index 188030ff..5a0178b6 100644 --- a/integration-cli/docker_cli_update_test.go +++ b/integration-cli/docker_cli_update_test.go @@ -5,7 +5,7 @@ import ( "time" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestUpdateRestartPolicy(c *check.C) { diff --git a/integration-cli/docker_cli_update_unix_test.go b/integration-cli/docker_cli_update_unix_test.go index c40ad3ee..e4267b1d 100644 --- a/integration-cli/docker_cli_update_unix_test.go +++ b/integration-cli/docker_cli_update_unix_test.go @@ -9,7 +9,7 @@ import ( "github.com/docker/docker/pkg/integration/checker" "github.com/docker/engine-api/types" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestUpdateRunningContainer(c *check.C) { diff --git a/integration-cli/docker_cli_userns_test.go b/integration-cli/docker_cli_userns_test.go index f8b3f77b..d14d5d35 100644 --- a/integration-cli/docker_cli_userns_test.go +++ b/integration-cli/docker_cli_userns_test.go @@ -13,7 +13,7 @@ import ( "github.com/docker/docker/pkg/integration/checker" "github.com/docker/docker/pkg/system" - "github.com/go-check/check" + "gopkg.in/check.v1" ) // user namespaces test: run daemon with remapped root setting diff --git a/integration-cli/docker_cli_v2_only_test.go b/integration-cli/docker_cli_v2_only_test.go index 889936a0..72438e91 100644 --- a/integration-cli/docker_cli_v2_only_test.go +++ b/integration-cli/docker_cli_v2_only_test.go @@ -6,7 +6,7 @@ import ( "net/http" "os" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func makefile(contents string) (string, func(), error) { diff --git a/integration-cli/docker_cli_version_test.go b/integration-cli/docker_cli_version_test.go index 7672beb7..16d02c98 100644 --- a/integration-cli/docker_cli_version_test.go +++ b/integration-cli/docker_cli_version_test.go @@ -4,7 +4,7 @@ import ( "strings" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" ) // ensure docker version works diff --git a/integration-cli/docker_cli_volume_test.go b/integration-cli/docker_cli_volume_test.go index a10316f6..4bb0c3b4 100644 --- a/integration-cli/docker_cli_volume_test.go +++ b/integration-cli/docker_cli_volume_test.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestVolumeCliCreate(c *check.C) { diff --git a/integration-cli/docker_cli_wait_test.go b/integration-cli/docker_cli_wait_test.go index 29933975..4eb7f3ac 100644 --- a/integration-cli/docker_cli_wait_test.go +++ b/integration-cli/docker_cli_wait_test.go @@ -7,7 +7,7 @@ import ( "time" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" ) // non-blocking wait with 0 exit code diff --git a/integration-cli/docker_experimental_network_test.go b/integration-cli/docker_experimental_network_test.go index f33dbd1c..34377029 100644 --- a/integration-cli/docker_experimental_network_test.go +++ b/integration-cli/docker_experimental_network_test.go @@ -9,7 +9,7 @@ import ( "github.com/docker/docker/pkg/integration/checker" "github.com/docker/docker/pkg/parsers/kernel" - "github.com/go-check/check" + "gopkg.in/check.v1" ) var ( diff --git a/integration-cli/docker_hub_pull_suite_test.go b/integration-cli/docker_hub_pull_suite_test.go index 6aa93469..9533cc3b 100644 --- a/integration-cli/docker_hub_pull_suite_test.go +++ b/integration-cli/docker_hub_pull_suite_test.go @@ -6,7 +6,7 @@ import ( "strings" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func init() { diff --git a/integration-cli/docker_utils.go b/integration-cli/docker_utils.go index 31982871..e9e24527 100644 --- a/integration-cli/docker_utils.go +++ b/integration-cli/docker_utils.go @@ -30,7 +30,7 @@ import ( "github.com/docker/engine-api/types" "github.com/docker/go-connections/tlsconfig" "github.com/docker/go-units" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func init() { diff --git a/integration-cli/events_utils.go b/integration-cli/events_utils.go index cdd3106b..cc534db1 100644 --- a/integration-cli/events_utils.go +++ b/integration-cli/events_utils.go @@ -12,7 +12,7 @@ import ( "github.com/Sirupsen/logrus" "github.com/docker/docker/daemon/events/testutils" "github.com/docker/docker/pkg/integration/checker" - "github.com/go-check/check" + "gopkg.in/check.v1" ) // eventMatcher is a function that tries to match an event input. diff --git a/integration-cli/registry.go b/integration-cli/registry.go index fa3fb875..e0397718 100644 --- a/integration-cli/registry.go +++ b/integration-cli/registry.go @@ -9,7 +9,7 @@ import ( "path/filepath" "github.com/docker/distribution/digest" - "github.com/go-check/check" + "gopkg.in/check.v1" ) const ( diff --git a/integration-cli/registry_mock.go b/integration-cli/registry_mock.go index 300bf464..cf0c77a1 100644 --- a/integration-cli/registry_mock.go +++ b/integration-cli/registry_mock.go @@ -7,7 +7,7 @@ import ( "strings" "sync" - "github.com/go-check/check" + "gopkg.in/check.v1" ) type handlerFunc func(w http.ResponseWriter, r *http.Request) diff --git a/integration-cli/requirements.go b/integration-cli/requirements.go index e948c0aa..74d77c88 100644 --- a/integration-cli/requirements.go +++ b/integration-cli/requirements.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/go-check/check" + "gopkg.in/check.v1" ) type testCondition func() bool diff --git a/integration-cli/trust_server.go b/integration-cli/trust_server.go index 77314c39..dbdde325 100644 --- a/integration-cli/trust_server.go +++ b/integration-cli/trust_server.go @@ -14,7 +14,7 @@ import ( "github.com/docker/docker/cliconfig" "github.com/docker/docker/pkg/integration/checker" "github.com/docker/docker/pkg/tlsconfig" - "github.com/go-check/check" + "gopkg.in/check.v1" ) var notaryBinary = "notary" diff --git a/pkg/discovery/discovery_test.go b/pkg/discovery/discovery_test.go index 6084f3ef..b1a479cd 100644 --- a/pkg/discovery/discovery_test.go +++ b/pkg/discovery/discovery_test.go @@ -3,7 +3,7 @@ package discovery import ( "testing" - "github.com/go-check/check" + "gopkg.in/check.v1" ) // Hook up gocheck into the "go test" runner. diff --git a/pkg/discovery/file/file_test.go b/pkg/discovery/file/file_test.go index 667f00ba..03b6cb1c 100644 --- a/pkg/discovery/file/file_test.go +++ b/pkg/discovery/file/file_test.go @@ -7,7 +7,7 @@ import ( "github.com/docker/docker/pkg/discovery" - "github.com/go-check/check" + "gopkg.in/check.v1" ) // Hook up gocheck into the "go test" runner. diff --git a/pkg/discovery/generator_test.go b/pkg/discovery/generator_test.go index 6281c466..ba73a195 100644 --- a/pkg/discovery/generator_test.go +++ b/pkg/discovery/generator_test.go @@ -1,7 +1,7 @@ package discovery import ( - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DiscoverySuite) TestGeneratorNotGenerate(c *check.C) { diff --git a/pkg/discovery/kv/kv_test.go b/pkg/discovery/kv/kv_test.go index 4fe5239d..656e7c87 100644 --- a/pkg/discovery/kv/kv_test.go +++ b/pkg/discovery/kv/kv_test.go @@ -12,7 +12,7 @@ import ( "github.com/docker/libkv" "github.com/docker/libkv/store" - "github.com/go-check/check" + "gopkg.in/check.v1" ) // Hook up gocheck into the "go test" runner. diff --git a/pkg/discovery/memory/memory_test.go b/pkg/discovery/memory/memory_test.go index c2da0a06..70c67866 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" + "gopkg.in/check.v1" ) // Hook up gocheck into the "go test" runner. diff --git a/pkg/discovery/nodes/nodes_test.go b/pkg/discovery/nodes/nodes_test.go index e26568cf..a6b8fea1 100644 --- a/pkg/discovery/nodes/nodes_test.go +++ b/pkg/discovery/nodes/nodes_test.go @@ -5,7 +5,7 @@ import ( "github.com/docker/docker/pkg/discovery" - "github.com/go-check/check" + "gopkg.in/check.v1" ) // Hook up gocheck into the "go test" runner. diff --git a/pkg/integration/checker/checker.go b/pkg/integration/checker/checker.go index a5314994..a33808f3 100644 --- a/pkg/integration/checker/checker.go +++ b/pkg/integration/checker/checker.go @@ -2,7 +2,7 @@ package checker import ( - "github.com/go-check/check" + "gopkg.in/check.v1" "github.com/vdemeester/shakers" ) diff --git a/pkg/integration/dockerCmd_utils.go b/pkg/integration/dockerCmd_utils.go index fab3e062..54ea8cc3 100644 --- a/pkg/integration/dockerCmd_utils.go +++ b/pkg/integration/dockerCmd_utils.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/go-check/check" + "gopkg.in/check.v1" ) // We use the elongated quote mechanism for quoting error returns as diff --git a/pkg/integration/dockerCmd_utils_test.go b/pkg/integration/dockerCmd_utils_test.go index 3dd5d114..a5900db0 100644 --- a/pkg/integration/dockerCmd_utils_test.go +++ b/pkg/integration/dockerCmd_utils_test.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/go-check/check" + "gopkg.in/check.v1" ) const dockerBinary = "docker" -- 2.30.2