From d03d514895510b42b7e698a5b802bbde984ed879 Mon Sep 17 00:00:00 2001 From: Paul Tagliamonte Date: Wed, 4 Nov 2015 08:09:02 +0000 Subject: [PATCH] check-v1 Gbp-Pq: Name check-v1.patch --- integration-cli/check_test.go | 2 +- integration-cli/docker_api_attach_test.go | 2 +- integration-cli/docker_api_containers_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_logs_test.go | 2 +- integration-cli/docker_api_network_test.go | 2 +- integration-cli/docker_api_resize_test.go | 2 +- integration-cli/docker_api_service_test.go | 2 +- integration-cli/docker_api_stats_test.go | 2 +- integration-cli/docker_api_test.go | 2 +- integration-cli/docker_api_version_test.go | 2 +- integration-cli/docker_cli_attach_test.go | 2 +- integration-cli/docker_cli_attach_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_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_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_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_logs_test.go | 2 +- integration-cli/docker_cli_nat_test.go | 2 +- integration-cli/docker_cli_network_test.go | 2 +- integration-cli/docker_cli_pause_test.go | 2 +- integration-cli/docker_cli_port_test.go | 2 +- integration-cli/docker_cli_port_unix_test.go | 2 +- integration-cli/docker_cli_proxy_test.go | 2 +- integration-cli/docker_cli_ps_test.go | 2 +- integration-cli/docker_cli_pull_test.go | 2 +- integration-cli/docker_cli_push_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_service_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_v2_only.go | 2 +- integration-cli/docker_cli_version_test.go | 2 +- integration-cli/docker_cli_wait_test.go | 2 +- integration-cli/docker_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 +- 81 files changed, 81 insertions(+), 81 deletions(-) diff --git a/integration-cli/check_test.go b/integration-cli/check_test.go index defa02ea..f9e2c67c 100644 --- a/integration-cli/check_test.go +++ b/integration-cli/check_test.go @@ -3,7 +3,7 @@ package main import ( "testing" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func Test(t *testing.T) { diff --git a/integration-cli/docker_api_attach_test.go b/integration-cli/docker_api_attach_test.go index 06a1c486..001631e4 100644 --- a/integration-cli/docker_api_attach_test.go +++ b/integration-cli/docker_api_attach_test.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/go-check/check" + "gopkg.in/check.v1" "golang.org/x/net/websocket" ) diff --git a/integration-cli/docker_api_containers_test.go b/integration-cli/docker_api_containers_test.go index d8dc4483..571af60f 100644 --- a/integration-cli/docker_api_containers_test.go +++ b/integration-cli/docker_api_containers_test.go @@ -17,7 +17,7 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/pkg/stringid" "github.com/docker/docker/runconfig" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestContainerApiGetAll(c *check.C) { diff --git a/integration-cli/docker_api_events_test.go b/integration-cli/docker_api_events_test.go index 8ae7bf73..9120aa00 100644 --- a/integration-cli/docker_api_events_test.go +++ b/integration-cli/docker_api_events_test.go @@ -4,7 +4,7 @@ import ( "net/http" "time" - "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 01061ca6..817c734b 100644 --- a/integration-cli/docker_api_exec_resize_test.go +++ b/integration-cli/docker_api_exec_resize_test.go @@ -4,7 +4,7 @@ import ( "net/http" "strings" - "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 3d99fe6b..04462307 100644 --- a/integration-cli/docker_api_exec_test.go +++ b/integration-cli/docker_api_exec_test.go @@ -8,7 +8,7 @@ import ( "fmt" "net/http" - "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 339a2f48..ab21d4b3 100644 --- a/integration-cli/docker_api_images_test.go +++ b/integration-cli/docker_api_images_test.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/docker/docker/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 40842891..1616e0ef 100644 --- a/integration-cli/docker_api_info_test.go +++ b/integration-cli/docker_api_info_test.go @@ -4,7 +4,7 @@ import ( "net/http" "strings" - "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 2287e7d4..a57e6877 100644 --- a/integration-cli/docker_api_inspect_test.go +++ b/integration-cli/docker_api_inspect_test.go @@ -6,7 +6,7 @@ import ( "net/http" "strings" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestInspectApiContainerResponse(c *check.C) { diff --git a/integration-cli/docker_api_logs_test.go b/integration-cli/docker_api_logs_test.go index d4784475..d22f363e 100644 --- a/integration-cli/docker_api_logs_test.go +++ b/integration-cli/docker_api_logs_test.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "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 44d2b31b..2da958f5 100644 --- a/integration-cli/docker_api_network_test.go +++ b/integration-cli/docker_api_network_test.go @@ -7,7 +7,7 @@ import ( "fmt" "net/http" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func isNetworkAvailable(c *check.C, name string) bool { diff --git a/integration-cli/docker_api_resize_test.go b/integration-cli/docker_api_resize_test.go index c7a577b8..e4214033 100644 --- a/integration-cli/docker_api_resize_test.go +++ b/integration-cli/docker_api_resize_test.go @@ -4,7 +4,7 @@ import ( "net/http" "strings" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestResizeApiResponse(c *check.C) { diff --git a/integration-cli/docker_api_service_test.go b/integration-cli/docker_api_service_test.go index df072197..27b63c8a 100644 --- a/integration-cli/docker_api_service_test.go +++ b/integration-cli/docker_api_service_test.go @@ -7,7 +7,7 @@ import ( "fmt" "net/http" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func isServiceAvailable(c *check.C, name string, network string) bool { diff --git a/integration-cli/docker_api_stats_test.go b/integration-cli/docker_api_stats_test.go index f019e00d..d1868fd5 100644 --- a/integration-cli/docker_api_stats_test.go +++ b/integration-cli/docker_api_stats_test.go @@ -10,7 +10,7 @@ import ( "time" "github.com/docker/docker/api/types" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestCliStatsNoStreamGetCpu(c *check.C) { diff --git a/integration-cli/docker_api_test.go b/integration-cli/docker_api_test.go index 6cbf3019..05725830 100644 --- a/integration-cli/docker_api_test.go +++ b/integration-cli/docker_api_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/docker/docker/api" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestApiOptionsRoute(c *check.C) { diff --git a/integration-cli/docker_api_version_test.go b/integration-cli/docker_api_version_test.go index b756794c..42fb872d 100644 --- a/integration-cli/docker_api_version_test.go +++ b/integration-cli/docker_api_version_test.go @@ -6,7 +6,7 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/autogen/dockerversion" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestGetVersion(c *check.C) { diff --git a/integration-cli/docker_cli_attach_test.go b/integration-cli/docker_cli_attach_test.go index f45f775e..90e389ce 100644 --- a/integration-cli/docker_cli_attach_test.go +++ b/integration-cli/docker_cli_attach_test.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "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 9718dc07..c30ff458 100644 --- a/integration-cli/docker_cli_attach_unix_test.go +++ b/integration-cli/docker_cli_attach_unix_test.go @@ -9,7 +9,7 @@ import ( "time" "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_build_test.go b/integration-cli/docker_cli_build_test.go index 6dc24df9..ad56d5d4 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/builder/command" "github.com/docker/docker/pkg/archive" "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 fc7bd925..c246dbdd 100644 --- a/integration-cli/docker_cli_build_unix_test.go +++ b/integration-cli/docker_cli_build_unix_test.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/docker/docker/pkg/ulimit" - "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 71f8b1a8..a53e3db7 100644 --- a/integration-cli/docker_cli_by_digest_test.go +++ b/integration-cli/docker_cli_by_digest_test.go @@ -9,7 +9,7 @@ import ( "github.com/docker/distribution/digest" "github.com/docker/distribution/manifest" "github.com/docker/docker/utils" - "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 125b2e39..7e0d6f5c 100644 --- a/integration-cli/docker_cli_commit_test.go +++ b/integration-cli/docker_cli_commit_test.go @@ -3,7 +3,7 @@ package main import ( "strings" - "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 2b08f47e..1b574fbe 100644 --- a/integration-cli/docker_cli_config_test.go +++ b/integration-cli/docker_cli_config_test.go @@ -11,7 +11,7 @@ import ( "github.com/docker/docker/autogen/dockerversion" "github.com/docker/docker/pkg/homedir" - "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 945a34f4..f6f31597 100644 --- a/integration-cli/docker_cli_cp_from_container_test.go +++ b/integration-cli/docker_cli_cp_from_container_test.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - "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 64ae0b5d..94f69354 100644 --- a/integration-cli/docker_cli_cp_test.go +++ b/integration-cli/docker_cli_cp_test.go @@ -10,7 +10,7 @@ import ( "path/filepath" "strings" - "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 341121d2..a705ad1b 100644 --- a/integration-cli/docker_cli_cp_to_container_test.go +++ b/integration-cli/docker_cli_cp_to_container_test.go @@ -3,7 +3,7 @@ package main import ( "os" - "github.com/go-check/check" + "gopkg.in/check.v1" ) // docker cp LOCALPATH CONTAINER:PATH diff --git a/integration-cli/docker_cli_cp_utils.go b/integration-cli/docker_cli_cp_utils.go index c26ebfd7..9ed8a7d2 100644 --- a/integration-cli/docker_cli_cp_utils.go +++ b/integration-cli/docker_cli_cp_utils.go @@ -10,7 +10,7 @@ import ( "strings" "github.com/docker/docker/pkg/archive" - "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 482e96f9..9a0ad7eb 100644 --- a/integration-cli/docker_cli_create_test.go +++ b/integration-cli/docker_cli_create_test.go @@ -13,7 +13,7 @@ import ( "io/ioutil" "github.com/docker/docker/pkg/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 dc4f7920..51c51d23 100644 --- a/integration-cli/docker_cli_daemon_experimental_test.go +++ b/integration-cli/docker_cli_daemon_experimental_test.go @@ -6,7 +6,7 @@ import ( "os/exec" "strings" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func assertNetwork(c *check.C, d *Daemon, name string) { diff --git a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_cli_daemon_test.go index 992cd83e..2dec0ec6 100644 --- a/integration-cli/docker_cli_daemon_test.go +++ b/integration-cli/docker_cli_daemon_test.go @@ -17,7 +17,7 @@ import ( "github.com/docker/libnetwork/iptables" "github.com/docker/libtrust" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerDaemonSuite) TestDaemonRestartWithRunningContainersPorts(c *check.C) { diff --git a/integration-cli/docker_cli_diff_test.go b/integration-cli/docker_cli_diff_test.go index b5fc1bd2..40416207 100644 --- a/integration-cli/docker_cli_diff_test.go +++ b/integration-cli/docker_cli_diff_test.go @@ -3,7 +3,7 @@ package main import ( "strings" - "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 6742ea45..2bcbfcda 100644 --- a/integration-cli/docker_cli_events_test.go +++ b/integration-cli/docker_cli_events_test.go @@ -13,7 +13,7 @@ import ( "sync" "time" - "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 1a08f2b3..fd6dcd62 100644 --- a/integration-cli/docker_cli_events_unix_test.go +++ b/integration-cli/docker_cli_events_unix_test.go @@ -10,7 +10,7 @@ import ( "os/exec" "unicode" - "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 8e85988f..a626a7d5 100644 --- a/integration-cli/docker_cli_exec_test.go +++ b/integration-cli/docker_cli_exec_test.go @@ -15,7 +15,7 @@ import ( "sync" "time" - "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 28c202c4..fa0b274d 100644 --- a/integration-cli/docker_cli_exec_unix_test.go +++ b/integration-cli/docker_cli_exec_unix_test.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "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 694222bf..100b6c42 100644 --- a/integration-cli/docker_cli_experimental_test.go +++ b/integration-cli/docker_cli_experimental_test.go @@ -5,7 +5,7 @@ package main import ( "strings" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestExperimentalVersion(c *check.C) { diff --git a/integration-cli/docker_cli_export_import_test.go b/integration-cli/docker_cli_export_import_test.go index a9e75de8..f2277556 100644 --- a/integration-cli/docker_cli_export_import_test.go +++ b/integration-cli/docker_cli_export_import_test.go @@ -5,7 +5,7 @@ import ( "os/exec" "strings" - "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_help_test.go b/integration-cli/docker_cli_help_test.go index 31130835..2c83671d 100644 --- a/integration-cli/docker_cli_help_test.go +++ b/integration-cli/docker_cli_help_test.go @@ -8,7 +8,7 @@ import ( "unicode" "github.com/docker/docker/pkg/homedir" - "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 355e4c8f..7faac52e 100644 --- a/integration-cli/docker_cli_history_test.go +++ b/integration-cli/docker_cli_history_test.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "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 fe12f02e..1bc04ef1 100644 --- a/integration-cli/docker_cli_images_test.go +++ b/integration-cli/docker_cli_images_test.go @@ -8,7 +8,7 @@ import ( "time" "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 ccfc452d..5d250687 100644 --- a/integration-cli/docker_cli_import_test.go +++ b/integration-cli/docker_cli_import_test.go @@ -7,7 +7,7 @@ import ( "os/exec" "strings" - "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 86719f4e..134c5c6e 100644 --- a/integration-cli/docker_cli_info_test.go +++ b/integration-cli/docker_cli_info_test.go @@ -4,7 +4,7 @@ import ( "strings" "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 fada86e6..4c4f98b1 100644 --- a/integration-cli/docker_cli_inspect_experimental_test.go +++ b/integration-cli/docker_cli_inspect_experimental_test.go @@ -4,7 +4,7 @@ package main import ( "github.com/docker/docker/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 3e42d0c3..c52c2c87 100644 --- a/integration-cli/docker_cli_inspect_test.go +++ b/integration-cli/docker_cli_inspect_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/docker/docker/api/types" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestInspectImage(c *check.C) { diff --git a/integration-cli/docker_cli_kill_test.go b/integration-cli/docker_cli_kill_test.go index 685f4f5e..a3989b03 100644 --- a/integration-cli/docker_cli_kill_test.go +++ b/integration-cli/docker_cli_kill_test.go @@ -5,7 +5,7 @@ import ( "net/http" "strings" - "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 568f20a9..e76f83dc 100644 --- a/integration-cli/docker_cli_links_test.go +++ b/integration-cli/docker_cli_links_test.go @@ -2,7 +2,7 @@ package main import ( "fmt" - "github.com/go-check/check" + "gopkg.in/check.v1" "reflect" "regexp" "strings" diff --git a/integration-cli/docker_cli_links_unix_test.go b/integration-cli/docker_cli_links_unix_test.go index 67a44643..bb886df4 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" "strings" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestLinksEtcHostsRegularFile(c *check.C) { diff --git a/integration-cli/docker_cli_login_test.go b/integration-cli/docker_cli_login_test.go index 3b4431d2..409a007d 100644 --- a/integration-cli/docker_cli_login_test.go +++ b/integration-cli/docker_cli_login_test.go @@ -4,7 +4,7 @@ import ( "bytes" "os/exec" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestLoginWithoutTTY(c *check.C) { diff --git a/integration-cli/docker_cli_logs_test.go b/integration-cli/docker_cli_logs_test.go index 6c942177..076e227f 100644 --- a/integration-cli/docker_cli_logs_test.go +++ b/integration-cli/docker_cli_logs_test.go @@ -11,7 +11,7 @@ import ( "time" "github.com/docker/docker/pkg/timeutils" - "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 a0773fef..d1044f51 100644 --- a/integration-cli/docker_cli_nat_test.go +++ b/integration-cli/docker_cli_nat_test.go @@ -6,7 +6,7 @@ import ( "net" "strings" - "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_network_test.go b/integration-cli/docker_cli_network_test.go index 08b225d2..d931addb 100644 --- a/integration-cli/docker_cli_network_test.go +++ b/integration-cli/docker_cli_network_test.go @@ -5,7 +5,7 @@ package main import ( "strings" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func assertNwIsAvailable(c *check.C, name string) { diff --git a/integration-cli/docker_cli_pause_test.go b/integration-cli/docker_cli_pause_test.go index 4e32dfc1..72c9b4cc 100644 --- a/integration-cli/docker_cli_pause_test.go +++ b/integration-cli/docker_cli_pause_test.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "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 63bfc9a0..4eb5d447 100644 --- a/integration-cli/docker_cli_port_test.go +++ b/integration-cli/docker_cli_port_test.go @@ -6,7 +6,7 @@ import ( "sort" "strings" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestPortList(c *check.C) { diff --git a/integration-cli/docker_cli_port_unix_test.go b/integration-cli/docker_cli_port_unix_test.go index 0988ca96..4cbf0ee4 100644 --- a/integration-cli/docker_cli_port_unix_test.go +++ b/integration-cli/docker_cli_port_unix_test.go @@ -6,7 +6,7 @@ import ( "net" "strings" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestPortHostBinding(c *check.C) { diff --git a/integration-cli/docker_cli_proxy_test.go b/integration-cli/docker_cli_proxy_test.go index 8b55c67d..45737f02 100644 --- a/integration-cli/docker_cli_proxy_test.go +++ b/integration-cli/docker_cli_proxy_test.go @@ -5,7 +5,7 @@ import ( "os/exec" "strings" - "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 3b8f6f99..25a2e873 100644 --- a/integration-cli/docker_cli_ps_test.go +++ b/integration-cli/docker_cli_ps_test.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestPsListContainers(c *check.C) { diff --git a/integration-cli/docker_cli_pull_test.go b/integration-cli/docker_cli_pull_test.go index 8bfca8db..581366b3 100644 --- a/integration-cli/docker_cli_pull_test.go +++ b/integration-cli/docker_cli_pull_test.go @@ -11,7 +11,7 @@ import ( "time" "github.com/docker/distribution/digest" - "github.com/go-check/check" + "gopkg.in/check.v1" ) // See issue docker/docker#8141 diff --git a/integration-cli/docker_cli_push_test.go b/integration-cli/docker_cli_push_test.go index 111e9f33..a087258d 100644 --- a/integration-cli/docker_cli_push_test.go +++ b/integration-cli/docker_cli_push_test.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/go-check/check" + "gopkg.in/check.v1" ) // Pushing an image to a private registry. diff --git a/integration-cli/docker_cli_rename_test.go b/integration-cli/docker_cli_rename_test.go index cac9f3aa..3ecc8140 100644 --- a/integration-cli/docker_cli_rename_test.go +++ b/integration-cli/docker_cli_rename_test.go @@ -4,7 +4,7 @@ import ( "strings" "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 4cabeb9c..c558c3df 100644 --- a/integration-cli/docker_cli_restart_test.go +++ b/integration-cli/docker_cli_restart_test.go @@ -4,7 +4,7 @@ import ( "strings" "time" - "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 0e57551b..69104bff 100644 --- a/integration-cli/docker_cli_rm_test.go +++ b/integration-cli/docker_cli_rm_test.go @@ -4,7 +4,7 @@ import ( "os" "strings" - "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 8d9f94f2..48faf9c2 100644 --- a/integration-cli/docker_cli_rmi_test.go +++ b/integration-cli/docker_cli_rmi_test.go @@ -5,7 +5,7 @@ import ( "os/exec" "strings" - "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 92889574..a04d03f4 100644 --- a/integration-cli/docker_cli_run_test.go +++ b/integration-cli/docker_cli_run_test.go @@ -20,7 +20,7 @@ import ( "github.com/docker/docker/pkg/nat" "github.com/docker/libnetwork/resolvconf" - "github.com/go-check/check" + "gopkg.in/check.v1" ) // "test123" should be printed by docker run diff --git a/integration-cli/docker_cli_run_unix_test.go b/integration-cli/docker_cli_run_unix_test.go index 295bace8..140b2bad 100644 --- a/integration-cli/docker_cli_run_unix_test.go +++ b/integration-cli/docker_cli_run_unix_test.go @@ -14,7 +14,7 @@ import ( "time" "github.com/docker/docker/pkg/mount" - "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 5b4b64d7..eb0d63fc 100644 --- a/integration-cli/docker_cli_save_load_test.go +++ b/integration-cli/docker_cli_save_load_test.go @@ -10,7 +10,7 @@ import ( "sort" "strings" - "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 2bca3b85..991b9407 100644 --- a/integration-cli/docker_cli_save_load_unix_test.go +++ b/integration-cli/docker_cli_save_load_unix_test.go @@ -8,7 +8,7 @@ import ( "os" "os/exec" - "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 d89c05cc..40db0df6 100644 --- a/integration-cli/docker_cli_search_test.go +++ b/integration-cli/docker_cli_search_test.go @@ -3,7 +3,7 @@ package main import ( "strings" - "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_service_test.go b/integration-cli/docker_cli_service_test.go index aaf5e819..91b7b8b0 100644 --- a/integration-cli/docker_cli_service_test.go +++ b/integration-cli/docker_cli_service_test.go @@ -6,7 +6,7 @@ import ( "fmt" "strings" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func assertSrvIsAvailable(c *check.C, sname, name string) { diff --git a/integration-cli/docker_cli_start_test.go b/integration-cli/docker_cli_start_test.go index ce5c48e6..8027735d 100644 --- a/integration-cli/docker_cli_start_test.go +++ b/integration-cli/docker_cli_start_test.go @@ -5,7 +5,7 @@ import ( "strings" "time" - "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 71f9f2d5..1fddee06 100644 --- a/integration-cli/docker_cli_start_volume_driver_unix_test.go +++ b/integration-cli/docker_cli_start_volume_driver_unix_test.go @@ -12,7 +12,7 @@ import ( "path/filepath" "strings" - "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 25040289..7cd63679 100644 --- a/integration-cli/docker_cli_stats_test.go +++ b/integration-cli/docker_cli_stats_test.go @@ -5,7 +5,7 @@ import ( "strings" "time" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestCliStatsNoStream(c *check.C) { diff --git a/integration-cli/docker_cli_tag_test.go b/integration-cli/docker_cli_tag_test.go index 23f2aefa..109dae3f 100644 --- a/integration-cli/docker_cli_tag_test.go +++ b/integration-cli/docker_cli_tag_test.go @@ -4,7 +4,7 @@ import ( "strings" "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 667a6c80..cbca9694 100644 --- a/integration-cli/docker_cli_top_test.go +++ b/integration-cli/docker_cli_top_test.go @@ -3,7 +3,7 @@ package main import ( "strings" - "github.com/go-check/check" + "gopkg.in/check.v1" ) func (s *DockerSuite) TestTopMultipleArgs(c *check.C) { diff --git a/integration-cli/docker_cli_v2_only.go b/integration-cli/docker_cli_v2_only.go index aa3d6a22..539f4591 100644 --- a/integration-cli/docker_cli_v2_only.go +++ b/integration-cli/docker_cli_v2_only.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 f2d8b651..b1ea96c0 100644 --- a/integration-cli/docker_cli_version_test.go +++ b/integration-cli/docker_cli_version_test.go @@ -3,7 +3,7 @@ package main import ( "strings" - "github.com/go-check/check" + "gopkg.in/check.v1" ) // ensure docker version works diff --git a/integration-cli/docker_cli_wait_test.go b/integration-cli/docker_cli_wait_test.go index 167ea1a0..0503fbb4 100644 --- a/integration-cli/docker_cli_wait_test.go +++ b/integration-cli/docker_cli_wait_test.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/go-check/check" + "gopkg.in/check.v1" ) // non-blocking wait with 0 exit code diff --git a/integration-cli/docker_utils.go b/integration-cli/docker_utils.go index e80015d1..fcb32428 100644 --- a/integration-cli/docker_utils.go +++ b/integration-cli/docker_utils.go @@ -24,7 +24,7 @@ import ( "github.com/docker/docker/opts" "github.com/docker/docker/pkg/ioutils" "github.com/docker/docker/pkg/stringutils" - "github.com/go-check/check" + "gopkg.in/check.v1" ) // Daemon represents a Docker daemon for the testing framework. diff --git a/integration-cli/registry.go b/integration-cli/registry.go index 35e1b4eb..4aee021f 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 v2binary = "registry-v2" diff --git a/integration-cli/registry_mock.go b/integration-cli/registry_mock.go index e5fb64c1..9599eb2b 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 ce080d50..a08febea 100644 --- a/integration-cli/requirements.go +++ b/integration-cli/requirements.go @@ -10,7 +10,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 89d88a84..dcd245da 100644 --- a/integration-cli/trust_server.go +++ b/integration-cli/trust_server.go @@ -12,7 +12,7 @@ import ( "time" "github.com/docker/docker/pkg/tlsconfig" - "github.com/go-check/check" + "gopkg.in/check.v1" ) var notaryBinary = "notary-server" -- 2.30.2