diff --git a/integration-cli/benchmark_test.go b/integration-cli/benchmark_test.go index b87e131b7e..ae0f67f6b0 100644 --- a/integration-cli/benchmark_test.go +++ b/integration-cli/benchmark_test.go @@ -8,7 +8,7 @@ import ( "strings" "sync" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" ) diff --git a/pkg/integration/checker/checker.go b/integration-cli/checker/checker.go similarity index 100% rename from pkg/integration/checker/checker.go rename to integration-cli/checker/checker.go diff --git a/integration-cli/daemon/daemon.go b/integration-cli/daemon/daemon.go index fab785da60..5890dd2cb2 100644 --- a/integration-cli/daemon/daemon.go +++ b/integration-cli/daemon/daemon.go @@ -19,12 +19,12 @@ import ( "time" "github.com/docker/docker/api/types/events" + "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/opts" - "github.com/docker/docker/pkg/integration" - "github.com/docker/docker/pkg/integration/checker" - icmd "github.com/docker/docker/pkg/integration/cmd" "github.com/docker/docker/pkg/ioutils" "github.com/docker/docker/pkg/stringid" + "github.com/docker/docker/pkg/testutil" + icmd "github.com/docker/docker/pkg/testutil/cmd" "github.com/docker/go-connections/sockets" "github.com/docker/go-connections/tlsconfig" "github.com/go-check/check" @@ -543,7 +543,7 @@ func (d *Daemon) queryRootDir() (string, error) { } var b []byte var i Info - b, err = integration.ReadBody(body) + b, err = testutil.ReadBody(body) if err == nil && resp.StatusCode == http.StatusOK { // read the docker root dir if err = json.Unmarshal(b, &i); err == nil { @@ -570,7 +570,7 @@ func (d *Daemon) WaitRun(contID string) error { // GetBaseDeviceSize returns the base device size of the daemon func (d *Daemon) GetBaseDeviceSize(c *check.C) int64 { - infoCmdOutput, _, err := integration.RunCommandPipelineWithOutput( + infoCmdOutput, _, err := testutil.RunCommandPipelineWithOutput( exec.Command(d.dockerBinary, "-H", d.Sock(), "info"), exec.Command("grep", "Base Device Size"), ) @@ -617,7 +617,7 @@ func (d *Daemon) SockRequest(method, endpoint string, data interface{}) (int, [] if err != nil { return -1, nil, err } - b, err := integration.ReadBody(body) + b, err := testutil.ReadBody(body) return res.StatusCode, b, err } diff --git a/integration-cli/daemon/daemon_swarm.go b/integration-cli/daemon/daemon_swarm.go index 2c18b977f0..bc9fd41ace 100644 --- a/integration-cli/daemon/daemon_swarm.go +++ b/integration-cli/daemon/daemon_swarm.go @@ -10,7 +10,7 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/swarm" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" "github.com/pkg/errors" ) diff --git a/integration-cli/docker_api_attach_test.go b/integration-cli/docker_api_attach_test.go index 6490069a52..d9d63d3ead 100644 --- a/integration-cli/docker_api_attach_test.go +++ b/integration-cli/docker_api_attach_test.go @@ -12,9 +12,9 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/client" - "github.com/docker/docker/pkg/integration" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/pkg/stdcopy" + "github.com/docker/docker/pkg/testutil" "github.com/go-check/check" "golang.org/x/net/websocket" ) @@ -80,7 +80,7 @@ func (s *DockerSuite) TestPostContainersAttachContainerNotFound(c *check.C) { // connection will shutdown, err should be "persistent connection closed" c.Assert(err, checker.NotNil) // Server shutdown connection - body, err := integration.ReadBody(resp.Body) + body, err := testutil.ReadBody(resp.Body) c.Assert(err, checker.IsNil) c.Assert(resp.StatusCode, checker.Equals, http.StatusNotFound) expected := "No such container: doesnotexist\r\n" diff --git a/integration-cli/docker_api_auth_test.go b/integration-cli/docker_api_auth_test.go index bfcae31bd0..763e56f273 100644 --- a/integration-cli/docker_api_auth_test.go +++ b/integration-cli/docker_api_auth_test.go @@ -4,7 +4,7 @@ import ( "net/http" "github.com/docker/docker/api/types" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_api_build_test.go b/integration-cli/docker_api_build_test.go index 0cc97a95d7..3ff9d18818 100644 --- a/integration-cli/docker_api_build_test.go +++ b/integration-cli/docker_api_build_test.go @@ -7,8 +7,8 @@ import ( "regexp" "strings" - "github.com/docker/docker/pkg/integration" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" + "github.com/docker/docker/pkg/testutil" "github.com/go-check/check" ) @@ -35,7 +35,7 @@ RUN find /tmp/` c.Assert(err, checker.IsNil) c.Assert(res.StatusCode, checker.Equals, http.StatusOK) - buf, err := integration.ReadBody(body) + buf, err := testutil.ReadBody(body) c.Assert(err, checker.IsNil) // Make sure Dockerfile exists. @@ -126,7 +126,7 @@ RUN echo 'right' c.Assert(res.StatusCode, checker.Equals, http.StatusOK) defer body.Close() - content, err := integration.ReadBody(body) + content, err := testutil.ReadBody(body) c.Assert(err, checker.IsNil) // Build used the wrong dockerfile. @@ -145,7 +145,7 @@ RUN echo from dockerfile`, c.Assert(err, checker.IsNil) c.Assert(res.StatusCode, checker.Equals, http.StatusOK) - buf, err := integration.ReadBody(body) + buf, err := testutil.ReadBody(body) c.Assert(err, checker.IsNil) out := string(buf) @@ -167,7 +167,7 @@ RUN echo from Dockerfile`, c.Assert(err, checker.IsNil) c.Assert(res.StatusCode, checker.Equals, http.StatusOK) - buf, err := integration.ReadBody(body) + buf, err := testutil.ReadBody(body) c.Assert(err, checker.IsNil) out := string(buf) @@ -190,7 +190,7 @@ RUN echo from dockerfile`, c.Assert(err, checker.IsNil) c.Assert(res.StatusCode, checker.Equals, http.StatusOK) - buf, err := integration.ReadBody(body) + buf, err := testutil.ReadBody(body) c.Assert(err, checker.IsNil) out := string(buf) @@ -237,7 +237,7 @@ func (s *DockerSuite) TestBuildAPIUnnormalizedTarPaths(c *check.C) { c.Assert(err, checker.IsNil) c.Assert(res.StatusCode, checker.Equals, http.StatusOK) - out, err := integration.ReadBody(body) + out, err := testutil.ReadBody(body) c.Assert(err, checker.IsNil) lines := strings.Split(string(out), "\n") c.Assert(len(lines), checker.GreaterThan, 1) diff --git a/integration-cli/docker_api_containers_test.go b/integration-cli/docker_api_containers_test.go index e0f2ec50da..2a528612b7 100644 --- a/integration-cli/docker_api_containers_test.go +++ b/integration-cli/docker_api_containers_test.go @@ -21,11 +21,11 @@ import ( containertypes "github.com/docker/docker/api/types/container" mounttypes "github.com/docker/docker/api/types/mount" networktypes "github.com/docker/docker/api/types/network" - "github.com/docker/docker/pkg/integration" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/pkg/ioutils" "github.com/docker/docker/pkg/mount" "github.com/docker/docker/pkg/stringid" + "github.com/docker/docker/pkg/testutil" "github.com/docker/docker/volume" "github.com/go-check/check" ) @@ -215,7 +215,7 @@ func (s *DockerSuite) TestGetContainerStatsRmRunning(c *check.C) { out, _ := runSleepingContainer(c) id := strings.TrimSpace(out) - buf := &integration.ChannelBuffer{make(chan []byte, 1)} + buf := &testutil.ChannelBuffer{make(chan []byte, 1)} defer buf.Close() _, body, err := sockRequestRaw("GET", "/containers/"+id+"/stats?stream=1", nil, "application/json") @@ -723,7 +723,7 @@ func (s *DockerSuite) TestContainerAPIInvalidPortSyntax(c *check.C) { c.Assert(err, checker.IsNil) c.Assert(res.StatusCode, checker.Equals, http.StatusInternalServerError) - b, err := integration.ReadBody(body) + b, err := testutil.ReadBody(body) c.Assert(err, checker.IsNil) c.Assert(string(b[:]), checker.Contains, "invalid port") } @@ -743,7 +743,7 @@ func (s *DockerSuite) TestContainerAPIRestartPolicyInvalidPolicyName(c *check.C) c.Assert(err, checker.IsNil) c.Assert(res.StatusCode, checker.Equals, http.StatusInternalServerError) - b, err := integration.ReadBody(body) + b, err := testutil.ReadBody(body) c.Assert(err, checker.IsNil) c.Assert(string(b[:]), checker.Contains, "invalid restart policy") } @@ -763,7 +763,7 @@ func (s *DockerSuite) TestContainerAPIRestartPolicyRetryMismatch(c *check.C) { c.Assert(err, checker.IsNil) c.Assert(res.StatusCode, checker.Equals, http.StatusInternalServerError) - b, err := integration.ReadBody(body) + b, err := testutil.ReadBody(body) c.Assert(err, checker.IsNil) c.Assert(string(b[:]), checker.Contains, "maximum retry count cannot be used with restart policy") } @@ -783,7 +783,7 @@ func (s *DockerSuite) TestContainerAPIRestartPolicyNegativeRetryCount(c *check.C c.Assert(err, checker.IsNil) c.Assert(res.StatusCode, checker.Equals, http.StatusInternalServerError) - b, err := integration.ReadBody(body) + b, err := testutil.ReadBody(body) c.Assert(err, checker.IsNil) c.Assert(string(b[:]), checker.Contains, "maximum retry count cannot be negative") } @@ -834,7 +834,7 @@ func (s *DockerSuite) TestContainerAPIPostCreateNull(c *check.C) { c.Assert(err, checker.IsNil) c.Assert(res.StatusCode, checker.Equals, http.StatusCreated) - b, err := integration.ReadBody(body) + b, err := testutil.ReadBody(body) c.Assert(err, checker.IsNil) type createResp struct { ID string @@ -863,7 +863,7 @@ func (s *DockerSuite) TestCreateWithTooLowMemoryLimit(c *check.C) { res, body, err := sockRequestRaw("POST", "/containers/create", strings.NewReader(config), "application/json") c.Assert(err, checker.IsNil) - b, err2 := integration.ReadBody(body) + b, err2 := testutil.ReadBody(body) c.Assert(err2, checker.IsNil) c.Assert(res.StatusCode, checker.Equals, http.StatusInternalServerError) diff --git a/integration-cli/docker_api_create_test.go b/integration-cli/docker_api_create_test.go index 41011c3157..7718b487a5 100644 --- a/integration-cli/docker_api_create_test.go +++ b/integration-cli/docker_api_create_test.go @@ -3,7 +3,7 @@ package main import ( "net/http" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_api_events_test.go b/integration-cli/docker_api_events_test.go index 3891c87379..a56d98c85e 100644 --- a/integration-cli/docker_api_events_test.go +++ b/integration-cli/docker_api_events_test.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/pkg/jsonmessage" "github.com/go-check/check" ) diff --git a/integration-cli/docker_api_exec_resize_test.go b/integration-cli/docker_api_exec_resize_test.go index cf4dded483..28ccd5e673 100644 --- a/integration-cli/docker_api_exec_resize_test.go +++ b/integration-cli/docker_api_exec_resize_test.go @@ -9,7 +9,7 @@ import ( "strings" "sync" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_api_exec_test.go b/integration-cli/docker_api_exec_test.go index def43b7484..5ca4da782b 100644 --- a/integration-cli/docker_api_exec_test.go +++ b/integration-cli/docker_api_exec_test.go @@ -10,8 +10,8 @@ import ( "strings" "time" - "github.com/docker/docker/pkg/integration" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" + "github.com/docker/docker/pkg/testutil" "github.com/go-check/check" ) @@ -41,7 +41,7 @@ func (s *DockerSuite) TestExecAPICreateNoValidContentType(c *check.C) { c.Assert(err, checker.IsNil) c.Assert(res.StatusCode, checker.Equals, http.StatusInternalServerError) - b, err := integration.ReadBody(body) + b, err := testutil.ReadBody(body) c.Assert(err, checker.IsNil) comment := check.Commentf("Expected message when creating exec command with invalid Content-Type specified") @@ -108,7 +108,7 @@ func (s *DockerSuite) TestExecAPIStartBackwardsCompatible(c *check.C) { resp, body, err := sockRequestRaw("POST", fmt.Sprintf("/v1.20/exec/%s/start", id), strings.NewReader(`{"Detach": true}`), "text/plain") c.Assert(err, checker.IsNil) - b, err := integration.ReadBody(body) + b, err := testutil.ReadBody(body) comment := check.Commentf("response body: %s", b) c.Assert(err, checker.IsNil, comment) c.Assert(resp.StatusCode, checker.Equals, http.StatusOK, comment) @@ -157,7 +157,7 @@ func (s *DockerSuite) TestExecAPIStartWithDetach(c *check.C) { _, body, err := sockRequestRaw("POST", fmt.Sprintf("/exec/%s/start", createResp.ID), strings.NewReader(`{"Detach": true}`), "application/json") c.Assert(err, checker.IsNil) - b, err = integration.ReadBody(body) + b, err = testutil.ReadBody(body) comment := check.Commentf("response body: %s", b) c.Assert(err, checker.IsNil, comment) @@ -183,7 +183,7 @@ func startExec(c *check.C, id string, code int) { resp, body, err := sockRequestRaw("POST", fmt.Sprintf("/exec/%s/start", id), strings.NewReader(`{"Detach": true}`), "application/json") c.Assert(err, checker.IsNil) - b, err := integration.ReadBody(body) + b, err := testutil.ReadBody(body) comment := check.Commentf("response body: %s", b) c.Assert(err, checker.IsNil, comment) c.Assert(resp.StatusCode, checker.Equals, code, comment) diff --git a/integration-cli/docker_api_images_test.go b/integration-cli/docker_api_images_test.go index cde8a7765c..6b24a39122 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/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_api_info_test.go b/integration-cli/docker_api_info_test.go index 1556099734..421b5fe3f3 100644 --- a/integration-cli/docker_api_info_test.go +++ b/integration-cli/docker_api_info_test.go @@ -3,7 +3,7 @@ package main import ( "net/http" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_api_inspect_test.go b/integration-cli/docker_api_inspect_test.go index 546b224c92..8785dd73f2 100644 --- a/integration-cli/docker_api_inspect_test.go +++ b/integration-cli/docker_api_inspect_test.go @@ -7,7 +7,7 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/versions/v1p20" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/pkg/stringutils" "github.com/go-check/check" ) diff --git a/integration-cli/docker_api_inspect_unix_test.go b/integration-cli/docker_api_inspect_unix_test.go index f49a139c28..cfa6781a9d 100644 --- a/integration-cli/docker_api_inspect_unix_test.go +++ b/integration-cli/docker_api_inspect_unix_test.go @@ -7,7 +7,7 @@ import ( "fmt" "net/http" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_api_logs_test.go b/integration-cli/docker_api_logs_test.go index 2e8ffa9bdc..5bc58f3e7c 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/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_api_network_test.go b/integration-cli/docker_api_network_test.go index 1cc66f0900..fb30d12807 100644 --- a/integration-cli/docker_api_network_test.go +++ b/integration-cli/docker_api_network_test.go @@ -11,7 +11,7 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/network" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_api_resize_test.go b/integration-cli/docker_api_resize_test.go index daf1b05d2e..fee2d16442 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/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_api_service_update_test.go b/integration-cli/docker_api_service_update_test.go index c61d122c18..02b30b2c73 100644 --- a/integration-cli/docker_api_service_update_test.go +++ b/integration-cli/docker_api_service_update_test.go @@ -4,8 +4,8 @@ package main import ( "github.com/docker/docker/api/types/swarm" + "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/integration-cli/daemon" - "github.com/docker/docker/pkg/integration/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_api_stats_test.go b/integration-cli/docker_api_stats_test.go index 23fbdbb740..5c81670f6d 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/api/types" "github.com/docker/docker/api/types/versions" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_api_stats_unix_test.go b/integration-cli/docker_api_stats_unix_test.go index 0995ce3833..95009a6d2d 100644 --- a/integration-cli/docker_api_stats_unix_test.go +++ b/integration-cli/docker_api_stats_unix_test.go @@ -8,7 +8,7 @@ import ( "net/http" "github.com/docker/docker/api/types" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_api_swarm_test.go b/integration-cli/docker_api_swarm_test.go index 33ad9611e7..bc36c47691 100644 --- a/integration-cli/docker_api_swarm_test.go +++ b/integration-cli/docker_api_swarm_test.go @@ -14,8 +14,8 @@ import ( "time" "github.com/docker/docker/api/types/swarm" + "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/integration-cli/daemon" - "github.com/docker/docker/pkg/integration/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_api_test.go b/integration-cli/docker_api_test.go index 714344d8d4..c0f15c09fd 100644 --- a/integration-cli/docker_api_test.go +++ b/integration-cli/docker_api_test.go @@ -9,9 +9,9 @@ import ( "strings" "github.com/docker/docker/api" - "github.com/docker/docker/pkg/integration" - "github.com/docker/docker/pkg/integration/checker" - icmd "github.com/docker/docker/pkg/integration/cmd" + "github.com/docker/docker/integration-cli/checker" + "github.com/docker/docker/pkg/testutil" + icmd "github.com/docker/docker/pkg/testutil/cmd" "github.com/go-check/check" ) @@ -79,7 +79,7 @@ func (s *DockerSuite) TestAPIErrorJSON(c *check.C) { c.Assert(err, checker.IsNil) c.Assert(httpResp.StatusCode, checker.Equals, http.StatusInternalServerError) c.Assert(httpResp.Header.Get("Content-Type"), checker.Equals, "application/json") - b, err := integration.ReadBody(body) + b, err := testutil.ReadBody(body) c.Assert(err, checker.IsNil) c.Assert(getErrorMessage(c, b), checker.Equals, "Config cannot be empty in order to create a container") } @@ -92,7 +92,7 @@ func (s *DockerSuite) TestAPIErrorPlainText(c *check.C) { c.Assert(err, checker.IsNil) c.Assert(httpResp.StatusCode, checker.Equals, http.StatusInternalServerError) c.Assert(httpResp.Header.Get("Content-Type"), checker.Contains, "text/plain") - b, err := integration.ReadBody(body) + b, err := testutil.ReadBody(body) c.Assert(err, checker.IsNil) c.Assert(strings.TrimSpace(string(b)), checker.Equals, "Config cannot be empty in order to create a container") } @@ -103,7 +103,7 @@ func (s *DockerSuite) TestAPIErrorNotFoundJSON(c *check.C) { c.Assert(err, checker.IsNil) c.Assert(httpResp.StatusCode, checker.Equals, http.StatusNotFound) c.Assert(httpResp.Header.Get("Content-Type"), checker.Equals, "application/json") - b, err := integration.ReadBody(body) + b, err := testutil.ReadBody(body) c.Assert(err, checker.IsNil) c.Assert(getErrorMessage(c, b), checker.Equals, "page not found") } @@ -113,7 +113,7 @@ func (s *DockerSuite) TestAPIErrorNotFoundPlainText(c *check.C) { c.Assert(err, checker.IsNil) c.Assert(httpResp.StatusCode, checker.Equals, http.StatusNotFound) c.Assert(httpResp.Header.Get("Content-Type"), checker.Contains, "text/plain") - b, err := integration.ReadBody(body) + b, err := testutil.ReadBody(body) c.Assert(err, checker.IsNil) c.Assert(strings.TrimSpace(string(b)), checker.Equals, "page not found") } diff --git a/integration-cli/docker_api_update_unix_test.go b/integration-cli/docker_api_update_unix_test.go index dfe14ec7b0..6b17ea9d4d 100644 --- a/integration-cli/docker_api_update_unix_test.go +++ b/integration-cli/docker_api_update_unix_test.go @@ -5,7 +5,7 @@ package main import ( "strings" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_api_version_test.go b/integration-cli/docker_api_version_test.go index eb2de5904a..1374232518 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/dockerversion" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_api_volumes_test.go b/integration-cli/docker_api_volumes_test.go index d1d44005e0..b3994ff3f9 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/api/types" volumetypes "github.com/docker/docker/api/types/volume" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_attach_test.go b/integration-cli/docker_cli_attach_test.go index 44a5ce463b..a776b83ab3 100644 --- a/integration-cli/docker_cli_attach_test.go +++ b/integration-cli/docker_cli_attach_test.go @@ -10,7 +10,7 @@ import ( "sync" "time" - icmd "github.com/docker/docker/pkg/integration/cmd" + icmd "github.com/docker/docker/pkg/testutil/cmd" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_attach_unix_test.go b/integration-cli/docker_cli_attach_unix_test.go index fb794ccc40..78f55e043d 100644 --- a/integration-cli/docker_cli_attach_unix_test.go +++ b/integration-cli/docker_cli_attach_unix_test.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/pkg/stringid" "github.com/go-check/check" "github.com/kr/pty" diff --git a/integration-cli/docker_cli_authz_plugin_v2_test.go b/integration-cli/docker_cli_authz_plugin_v2_test.go index 5fb000a1d6..c8f6efccd4 100644 --- a/integration-cli/docker_cli_authz_plugin_v2_test.go +++ b/integration-cli/docker_cli_authz_plugin_v2_test.go @@ -6,8 +6,8 @@ import ( "fmt" "strings" + "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/integration-cli/daemon" - "github.com/docker/docker/pkg/integration/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_authz_unix_test.go b/integration-cli/docker_cli_authz_unix_test.go index fe6bf89083..f003b09193 100644 --- a/integration-cli/docker_cli_authz_unix_test.go +++ b/integration-cli/docker_cli_authz_unix_test.go @@ -22,9 +22,9 @@ import ( "net/http/httputil" "net/url" + "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/integration-cli/daemon" "github.com/docker/docker/pkg/authorization" - "github.com/docker/docker/pkg/integration/checker" "github.com/docker/docker/pkg/plugins" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_build_test.go b/integration-cli/docker_cli_build_test.go index 2c66f0e9d2..a9fdedaafe 100644 --- a/integration-cli/docker_cli_build_test.go +++ b/integration-cli/docker_cli_build_test.go @@ -18,11 +18,11 @@ import ( "time" "github.com/docker/docker/builder/dockerfile/command" + "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/pkg/archive" - "github.com/docker/docker/pkg/integration" - "github.com/docker/docker/pkg/integration/checker" - icmd "github.com/docker/docker/pkg/integration/cmd" "github.com/docker/docker/pkg/stringutils" + "github.com/docker/docker/pkg/testutil" + icmd "github.com/docker/docker/pkg/testutil/cmd" "github.com/go-check/check" ) @@ -2086,7 +2086,7 @@ func (s *DockerSuite) TestBuildContextCleanup(c *check.C) { if err != nil { c.Fatalf("failed to list contents of tmp dir: %s", err) } - if err = integration.CompareDirectoryEntries(entries, entriesFinal); err != nil { + if err = testutil.CompareDirectoryEntries(entries, entriesFinal); err != nil { c.Fatalf("context should have been deleted, but wasn't") } @@ -2111,7 +2111,7 @@ func (s *DockerSuite) TestBuildContextCleanupFailedBuild(c *check.C) { if err != nil { c.Fatalf("failed to list contents of tmp dir: %s", err) } - if err = integration.CompareDirectoryEntries(entries, entriesFinal); err != nil { + if err = testutil.CompareDirectoryEntries(entries, entriesFinal); err != nil { c.Fatalf("context should have been deleted, but wasn't") } @@ -5342,7 +5342,7 @@ func (s *DockerSuite) TestBuildContainerWithCgroupParent(c *check.C) { if err != nil { c.Fatalf("failed to read '/proc/self/cgroup - %v", err) } - selfCgroupPaths := integration.ParseCgroupPaths(string(data)) + selfCgroupPaths := testutil.ParseCgroupPaths(string(data)) _, found := selfCgroupPaths["memory"] if !found { c.Fatalf("unable to find self memory cgroup path. CgroupsPath: %v", selfCgroupPaths) diff --git a/integration-cli/docker_cli_build_unix_test.go b/integration-cli/docker_cli_build_unix_test.go index 0205a927dd..aeda122fb5 100644 --- a/integration-cli/docker_cli_build_unix_test.go +++ b/integration-cli/docker_cli_build_unix_test.go @@ -14,8 +14,8 @@ import ( "strings" "time" - "github.com/docker/docker/pkg/integration" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" + "github.com/docker/docker/pkg/testutil" "github.com/docker/go-units" "github.com/go-check/check" ) @@ -194,7 +194,7 @@ func (s *DockerSuite) TestBuildCancellationKillsSleep(c *check.C) { } // Get the exit status of `docker build`, check it exited because killed. - if err := buildCmd.Wait(); err != nil && !integration.IsKilled(err) { + if err := buildCmd.Wait(); err != nil && !testutil.IsKilled(err) { c.Fatalf("wait failed during build run: %T %s", err, err) } diff --git a/integration-cli/docker_cli_by_digest_test.go b/integration-cli/docker_cli_by_digest_test.go index c28ffaca98..c372b72851 100644 --- a/integration-cli/docker_cli_by_digest_test.go +++ b/integration-cli/docker_cli_by_digest_test.go @@ -12,7 +12,7 @@ import ( "github.com/docker/distribution/manifest/schema1" "github.com/docker/distribution/manifest/schema2" "github.com/docker/docker/api/types" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/pkg/stringutils" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_commit_test.go b/integration-cli/docker_cli_commit_test.go index d3a3e0e44a..aa81624652 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/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_config_test.go b/integration-cli/docker_cli_config_test.go index 1d5e5ad3db..5ca83b75e9 100644 --- a/integration-cli/docker_cli_config_test.go +++ b/integration-cli/docker_cli_config_test.go @@ -11,8 +11,8 @@ import ( "github.com/docker/docker/api" "github.com/docker/docker/dockerversion" + "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/pkg/homedir" - "github.com/docker/docker/pkg/integration/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_cp_from_container_test.go b/integration-cli/docker_cli_cp_from_container_test.go index 9ed7e8c720..30cacf42bb 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/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_cp_test.go b/integration-cli/docker_cli_cp_test.go index 4badeb1200..510f94e654 100644 --- a/integration-cli/docker_cli_cp_test.go +++ b/integration-cli/docker_cli_cp_test.go @@ -10,9 +10,9 @@ import ( "path/filepath" "strings" - "github.com/docker/docker/pkg/integration" - "github.com/docker/docker/pkg/integration/checker" - icmd "github.com/docker/docker/pkg/integration/cmd" + "github.com/docker/docker/integration-cli/checker" + "github.com/docker/docker/pkg/testutil" + icmd "github.com/docker/docker/pkg/testutil/cmd" "github.com/go-check/check" ) @@ -546,7 +546,7 @@ func (s *DockerSuite) TestCpToStdout(c *check.C) { // failed to set up container c.Assert(strings.TrimSpace(out), checker.Equals, "0") - out, _, err := integration.RunCommandPipelineWithOutput( + out, _, err := testutil.RunCommandPipelineWithOutput( exec.Command(dockerBinary, "cp", containerID+":/test", "-"), exec.Command("tar", "-vtf", "-")) diff --git a/integration-cli/docker_cli_cp_to_container_test.go b/integration-cli/docker_cli_cp_to_container_test.go index f981cb8f8b..5d48cefd01 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/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" ) 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 97890a9cbb..a07dd61696 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 ( "strconv" "strings" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/pkg/system" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_cp_utils.go b/integration-cli/docker_cli_cp_utils.go index fb4b869e56..3c51ece1e1 100644 --- a/integration-cli/docker_cli_cp_utils.go +++ b/integration-cli/docker_cli_cp_utils.go @@ -9,8 +9,8 @@ import ( "path/filepath" "strings" + "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/pkg/archive" - "github.com/docker/docker/pkg/integration/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_create_test.go b/integration-cli/docker_cli_create_test.go index 6d9618c226..0f7676f91e 100644 --- a/integration-cli/docker_cli_create_test.go +++ b/integration-cli/docker_cli_create_test.go @@ -12,9 +12,9 @@ import ( "io/ioutil" - "github.com/docker/docker/pkg/integration" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/pkg/stringid" + "github.com/docker/docker/pkg/testutil" "github.com/docker/go-connections/nat" "github.com/go-check/check" ) @@ -356,7 +356,7 @@ func (s *DockerTrustSuite) TestCreateWhenCertExpired(c *check.C) { // Certificates have 10 years of expiration elevenYearsFromNow := time.Now().Add(time.Hour * 24 * 365 * 11) - integration.RunAtDifferentDate(elevenYearsFromNow, func() { + testutil.RunAtDifferentDate(elevenYearsFromNow, func() { // Try create createCmd := exec.Command(dockerBinary, "create", repoName) s.trustedCmd(createCmd) @@ -365,7 +365,7 @@ func (s *DockerTrustSuite) TestCreateWhenCertExpired(c *check.C) { c.Assert(string(out), checker.Contains, "could not validate the path to a trusted root", check.Commentf("Missing expected output on trusted create in the distant future:\n%s", out)) }) - integration.RunAtDifferentDate(elevenYearsFromNow, func() { + testutil.RunAtDifferentDate(elevenYearsFromNow, func() { // Try create createCmd := exec.Command(dockerBinary, "create", "--disable-content-trust", repoName) s.trustedCmd(createCmd) diff --git a/integration-cli/docker_cli_daemon_plugins_test.go b/integration-cli/docker_cli_daemon_plugins_test.go index b8bf5fb102..70ed4b68f8 100644 --- a/integration-cli/docker_cli_daemon_plugins_test.go +++ b/integration-cli/docker_cli_daemon_plugins_test.go @@ -9,7 +9,7 @@ import ( "strings" "syscall" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/pkg/mount" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_cli_daemon_test.go index b6a3dd22b1..ff1a303670 100644 --- a/integration-cli/docker_cli_daemon_test.go +++ b/integration-cli/docker_cli_daemon_test.go @@ -21,12 +21,12 @@ import ( "syscall" "time" + "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/integration-cli/daemon" - "github.com/docker/docker/pkg/integration" - "github.com/docker/docker/pkg/integration/checker" - icmd "github.com/docker/docker/pkg/integration/cmd" "github.com/docker/docker/pkg/mount" "github.com/docker/docker/pkg/stringid" + "github.com/docker/docker/pkg/testutil" + icmd "github.com/docker/docker/pkg/testutil/cmd" "github.com/docker/go-units" "github.com/docker/libnetwork/iptables" "github.com/docker/libtrust" @@ -1899,7 +1899,7 @@ func (s *DockerDaemonSuite) TestDaemonCgroupParent(c *check.C) { out, err := s.d.Cmd("run", "--name", name, "busybox", "cat", "/proc/self/cgroup") c.Assert(err, checker.IsNil) - cgroupPaths := integration.ParseCgroupPaths(string(out)) + cgroupPaths := testutil.ParseCgroupPaths(string(out)) c.Assert(len(cgroupPaths), checker.Not(checker.Equals), 0, check.Commentf("unexpected output - %q", string(out))) out, err = s.d.Cmd("inspect", "-f", "{{.Id}}", name) c.Assert(err, checker.IsNil) diff --git a/integration-cli/docker_cli_diff_test.go b/integration-cli/docker_cli_diff_test.go index 08cf6e1caa..c92853ddfd 100644 --- a/integration-cli/docker_cli_diff_test.go +++ b/integration-cli/docker_cli_diff_test.go @@ -4,7 +4,7 @@ import ( "strings" "time" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_events_test.go b/integration-cli/docker_cli_events_test.go index d454442669..dc9828ef8d 100644 --- a/integration-cli/docker_cli_events_test.go +++ b/integration-cli/docker_cli_events_test.go @@ -14,9 +14,9 @@ import ( eventtypes "github.com/docker/docker/api/types/events" eventstestutils "github.com/docker/docker/daemon/events/testutils" - "github.com/docker/docker/pkg/integration" - "github.com/docker/docker/pkg/integration/checker" - icmd "github.com/docker/docker/pkg/integration/cmd" + "github.com/docker/docker/integration-cli/checker" + "github.com/docker/docker/pkg/testutil" + icmd "github.com/docker/docker/pkg/testutil/cmd" "github.com/go-check/check" ) @@ -222,7 +222,7 @@ func (s *DockerSuite) TestEventsImageImport(c *check.C) { cleanedContainerID := strings.TrimSpace(out) since := daemonUnixTime(c) - out, _, err := integration.RunCommandPipelineWithOutput( + out, _, err := testutil.RunCommandPipelineWithOutput( exec.Command(dockerBinary, "export", cleanedContainerID), exec.Command(dockerBinary, "import", "-"), ) diff --git a/integration-cli/docker_cli_events_unix_test.go b/integration-cli/docker_cli_events_unix_test.go index 3348ff3e36..87bc80a4e6 100644 --- a/integration-cli/docker_cli_events_unix_test.go +++ b/integration-cli/docker_cli_events_unix_test.go @@ -14,7 +14,7 @@ import ( "time" "unicode" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" "github.com/kr/pty" ) diff --git a/integration-cli/docker_cli_exec_test.go b/integration-cli/docker_cli_exec_test.go index e3e92e4a27..bd72eaf925 100644 --- a/integration-cli/docker_cli_exec_test.go +++ b/integration-cli/docker_cli_exec_test.go @@ -15,8 +15,8 @@ import ( "sync" "time" - "github.com/docker/docker/pkg/integration/checker" - icmd "github.com/docker/docker/pkg/integration/cmd" + "github.com/docker/docker/integration-cli/checker" + icmd "github.com/docker/docker/pkg/testutil/cmd" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_exec_unix_test.go b/integration-cli/docker_cli_exec_unix_test.go index 3fbfcb2333..5d8efc70d0 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/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" "github.com/kr/pty" ) diff --git a/integration-cli/docker_cli_experimental_test.go b/integration-cli/docker_cli_experimental_test.go index 6a49cc8cb1..51181fe9cc 100644 --- a/integration-cli/docker_cli_experimental_test.go +++ b/integration-cli/docker_cli_experimental_test.go @@ -3,7 +3,7 @@ package main import ( "strings" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_export_import_test.go b/integration-cli/docker_cli_export_import_test.go index 069dc08162..a065d9cf96 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/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" ) 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 ad055e3d48..522242fa74 100644 --- a/integration-cli/docker_cli_external_volume_driver_unix_test.go +++ b/integration-cli/docker_cli_external_volume_driver_unix_test.go @@ -16,8 +16,8 @@ import ( "time" "github.com/docker/docker/api/types" + "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/integration-cli/daemon" - "github.com/docker/docker/pkg/integration/checker" "github.com/docker/docker/pkg/stringid" "github.com/docker/docker/volume" "github.com/go-check/check" diff --git a/integration-cli/docker_cli_health_test.go b/integration-cli/docker_cli_health_test.go index 6b7baebd00..ed692d3576 100644 --- a/integration-cli/docker_cli_health_test.go +++ b/integration-cli/docker_cli_health_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/docker/docker/api/types" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_help_test.go b/integration-cli/docker_cli_help_test.go index 88fb2d77c7..04d5446795 100644 --- a/integration-cli/docker_cli_help_test.go +++ b/integration-cli/docker_cli_help_test.go @@ -7,9 +7,9 @@ import ( "strings" "unicode" + "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/pkg/homedir" - "github.com/docker/docker/pkg/integration/checker" - icmd "github.com/docker/docker/pkg/integration/cmd" + icmd "github.com/docker/docker/pkg/testutil/cmd" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_history_test.go b/integration-cli/docker_cli_history_test.go index 9979080b1c..bc7d269d00 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/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_images_test.go b/integration-cli/docker_cli_images_test.go index 3b678a2586..79a8a34b7d 100644 --- a/integration-cli/docker_cli_images_test.go +++ b/integration-cli/docker_cli_images_test.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/pkg/stringid" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_import_test.go b/integration-cli/docker_cli_import_test.go index 080d3798ce..c1a5f65722 100644 --- a/integration-cli/docker_cli_import_test.go +++ b/integration-cli/docker_cli_import_test.go @@ -9,9 +9,9 @@ import ( "regexp" "strings" - "github.com/docker/docker/pkg/integration" - "github.com/docker/docker/pkg/integration/checker" - icmd "github.com/docker/docker/pkg/integration/cmd" + "github.com/docker/docker/integration-cli/checker" + "github.com/docker/docker/pkg/testutil" + icmd "github.com/docker/docker/pkg/testutil/cmd" "github.com/go-check/check" ) @@ -20,7 +20,7 @@ func (s *DockerSuite) TestImportDisplay(c *check.C) { out, _ := dockerCmd(c, "run", "-d", "busybox", "true") cleanedContainerID := strings.TrimSpace(out) - out, _, err := integration.RunCommandPipelineWithOutput( + out, _, err := testutil.RunCommandPipelineWithOutput( exec.Command(dockerBinary, "export", cleanedContainerID), exec.Command(dockerBinary, "import", "-"), ) diff --git a/integration-cli/docker_cli_info_test.go b/integration-cli/docker_cli_info_test.go index 063cd4f895..745893459b 100644 --- a/integration-cli/docker_cli_info_test.go +++ b/integration-cli/docker_cli_info_test.go @@ -6,8 +6,8 @@ import ( "net" "strings" + "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/integration-cli/daemon" - "github.com/docker/docker/pkg/integration/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_info_unix_test.go b/integration-cli/docker_cli_info_unix_test.go index b9323060dd..d55c05c4a5 100644 --- a/integration-cli/docker_cli_info_unix_test.go +++ b/integration-cli/docker_cli_info_unix_test.go @@ -3,7 +3,7 @@ package main import ( - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_inspect_test.go b/integration-cli/docker_cli_inspect_test.go index f38e8d2acf..3adf2d85d8 100644 --- a/integration-cli/docker_cli_inspect_test.go +++ b/integration-cli/docker_cli_inspect_test.go @@ -10,9 +10,9 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" + "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/integration-cli/environment" - "github.com/docker/docker/pkg/integration/checker" - icmd "github.com/docker/docker/pkg/integration/cmd" + icmd "github.com/docker/docker/pkg/testutil/cmd" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_kill_test.go b/integration-cli/docker_cli_kill_test.go index 43164801d4..f2c42f1c3f 100644 --- a/integration-cli/docker_cli_kill_test.go +++ b/integration-cli/docker_cli_kill_test.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_links_test.go b/integration-cli/docker_cli_links_test.go index 9eb1174e8e..55f04ea269 100644 --- a/integration-cli/docker_cli_links_test.go +++ b/integration-cli/docker_cli_links_test.go @@ -6,8 +6,8 @@ import ( "regexp" "strings" - "github.com/docker/docker/pkg/integration" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" + "github.com/docker/docker/pkg/testutil" "github.com/docker/docker/runconfig" "github.com/go-check/check" ) @@ -102,7 +102,7 @@ func (s *DockerSuite) TestLinksInspectLinksStarted(c *check.C) { err := json.Unmarshal([]byte(links), &result) c.Assert(err, checker.IsNil) - output := integration.ConvertSliceOfStringsToMap(result) + output := testutil.ConvertSliceOfStringsToMap(result) c.Assert(output, checker.DeepEquals, expected) } @@ -121,7 +121,7 @@ func (s *DockerSuite) TestLinksInspectLinksStopped(c *check.C) { err := json.Unmarshal([]byte(links), &result) c.Assert(err, checker.IsNil) - output := integration.ConvertSliceOfStringsToMap(result) + output := testutil.ConvertSliceOfStringsToMap(result) c.Assert(output, checker.DeepEquals, expected) } diff --git a/integration-cli/docker_cli_links_unix_test.go b/integration-cli/docker_cli_links_unix_test.go index 1af927930d..dbff2911a5 100644 --- a/integration-cli/docker_cli_links_unix_test.go +++ b/integration-cli/docker_cli_links_unix_test.go @@ -6,7 +6,7 @@ import ( "io/ioutil" "os" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_login_test.go b/integration-cli/docker_cli_login_test.go index 9cf5f2f37a..272405efc0 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/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_logout_test.go b/integration-cli/docker_cli_logout_test.go index a5f4b108cf..3b953d9285 100644 --- a/integration-cli/docker_cli_logout_test.go +++ b/integration-cli/docker_cli_logout_test.go @@ -8,7 +8,7 @@ import ( "os/exec" "path/filepath" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_logs_test.go b/integration-cli/docker_cli_logs_test.go index 2126ce921b..beec083f0e 100644 --- a/integration-cli/docker_cli_logs_test.go +++ b/integration-cli/docker_cli_logs_test.go @@ -8,9 +8,9 @@ import ( "strings" "time" - "github.com/docker/docker/pkg/integration" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/pkg/jsonlog" + "github.com/docker/docker/pkg/testutil" "github.com/go-check/check" ) @@ -254,11 +254,11 @@ func (s *DockerSuite) TestLogsFollowSlowStdoutConsumer(c *check.C) { c.Assert(logCmd.Start(), checker.IsNil) // First read slowly - bytes1, err := integration.ConsumeWithSpeed(stdout, 10, 50*time.Millisecond, stopSlowRead) + bytes1, err := testutil.ConsumeWithSpeed(stdout, 10, 50*time.Millisecond, stopSlowRead) c.Assert(err, checker.IsNil) // After the container has finished we can continue reading fast - bytes2, err := integration.ConsumeWithSpeed(stdout, 32*1024, 0, nil) + bytes2, err := testutil.ConsumeWithSpeed(stdout, 32*1024, 0, nil) c.Assert(err, checker.IsNil) actual := bytes1 + bytes2 diff --git a/integration-cli/docker_cli_nat_test.go b/integration-cli/docker_cli_nat_test.go index 7f4cc2cbd7..c1617c2163 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/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_netmode_test.go b/integration-cli/docker_cli_netmode_test.go index 4dfad937b5..7e63e9bf98 100644 --- a/integration-cli/docker_cli_netmode_test.go +++ b/integration-cli/docker_cli_netmode_test.go @@ -1,7 +1,7 @@ package main import ( - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/runconfig" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_network_unix_test.go b/integration-cli/docker_cli_network_unix_test.go index 1b33d3fbea..53b221f112 100644 --- a/integration-cli/docker_cli_network_unix_test.go +++ b/integration-cli/docker_cli_network_unix_test.go @@ -16,10 +16,10 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/versions/v1p20" + "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/integration-cli/daemon" - "github.com/docker/docker/pkg/integration/checker" - icmd "github.com/docker/docker/pkg/integration/cmd" "github.com/docker/docker/pkg/stringid" + icmd "github.com/docker/docker/pkg/testutil/cmd" "github.com/docker/docker/runconfig" "github.com/docker/libnetwork/driverapi" remoteapi "github.com/docker/libnetwork/drivers/remote/api" diff --git a/integration-cli/docker_cli_oom_killed_test.go b/integration-cli/docker_cli_oom_killed_test.go index bcf59f8601..54c34d206a 100644 --- a/integration-cli/docker_cli_oom_killed_test.go +++ b/integration-cli/docker_cli_oom_killed_test.go @@ -3,7 +3,7 @@ package main import ( - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_pause_test.go b/integration-cli/docker_cli_pause_test.go index 47bfab4471..a67e173097 100644 --- a/integration-cli/docker_cli_pause_test.go +++ b/integration-cli/docker_cli_pause_test.go @@ -3,7 +3,7 @@ package main import ( "strings" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_plugins_test.go b/integration-cli/docker_cli_plugins_test.go index 13ded6ee81..5af259347f 100644 --- a/integration-cli/docker_cli_plugins_test.go +++ b/integration-cli/docker_cli_plugins_test.go @@ -4,7 +4,7 @@ import ( "fmt" "os/exec" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" "io/ioutil" diff --git a/integration-cli/docker_cli_port_test.go b/integration-cli/docker_cli_port_test.go index 80b00fe93e..bcb87f5f33 100644 --- a/integration-cli/docker_cli_port_test.go +++ b/integration-cli/docker_cli_port_test.go @@ -7,7 +7,7 @@ import ( "sort" "strings" - "github.com/docker/docker/pkg/integration/checker" + "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 c15f90d1bd..6cd94aaab7 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/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_prune_unix_test.go b/integration-cli/docker_cli_prune_unix_test.go index 8186f1b83b..842a18c084 100644 --- a/integration-cli/docker_cli_prune_unix_test.go +++ b/integration-cli/docker_cli_prune_unix_test.go @@ -6,8 +6,8 @@ import ( "strconv" "strings" + "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/integration-cli/daemon" - "github.com/docker/docker/pkg/integration/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_ps_test.go b/integration-cli/docker_cli_ps_test.go index e36bd00f6b..4baff63df7 100644 --- a/integration-cli/docker_cli_ps_test.go +++ b/integration-cli/docker_cli_ps_test.go @@ -11,9 +11,9 @@ import ( "strings" "time" - "github.com/docker/docker/pkg/integration/checker" - icmd "github.com/docker/docker/pkg/integration/cmd" + "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/pkg/stringid" + icmd "github.com/docker/docker/pkg/testutil/cmd" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_pull_local_test.go b/integration-cli/docker_cli_pull_local_test.go index cb14c2c702..d99cb1c155 100644 --- a/integration-cli/docker_cli_pull_local_test.go +++ b/integration-cli/docker_cli_pull_local_test.go @@ -15,7 +15,7 @@ import ( "github.com/docker/distribution/manifest" "github.com/docker/distribution/manifest/manifestlist" "github.com/docker/distribution/manifest/schema2" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_pull_test.go b/integration-cli/docker_cli_pull_test.go index 10c641fb11..6fff8e9dbb 100644 --- a/integration-cli/docker_cli_pull_test.go +++ b/integration-cli/docker_cli_pull_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/docker/distribution/digest" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_pull_trusted_test.go b/integration-cli/docker_cli_pull_trusted_test.go index b89c7a5238..59ccfd0d2e 100644 --- a/integration-cli/docker_cli_pull_trusted_test.go +++ b/integration-cli/docker_cli_pull_trusted_test.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "github.com/docker/docker/pkg/integration" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" + "github.com/docker/docker/pkg/testutil" "github.com/go-check/check" ) @@ -70,7 +70,7 @@ func (s *DockerTrustSuite) TestPullWhenCertExpired(c *check.C) { // Certificates have 10 years of expiration elevenYearsFromNow := time.Now().Add(time.Hour * 24 * 365 * 11) - integration.RunAtDifferentDate(elevenYearsFromNow, func() { + testutil.RunAtDifferentDate(elevenYearsFromNow, func() { // Try pull pullCmd := exec.Command(dockerBinary, "pull", repoName) s.trustedCmd(pullCmd) @@ -80,7 +80,7 @@ func (s *DockerTrustSuite) TestPullWhenCertExpired(c *check.C) { c.Assert(string(out), checker.Contains, "could not validate the path to a trusted root", check.Commentf(out)) }) - integration.RunAtDifferentDate(elevenYearsFromNow, func() { + testutil.RunAtDifferentDate(elevenYearsFromNow, func() { // Try pull pullCmd := exec.Command(dockerBinary, "pull", "--disable-content-trust", repoName) s.trustedCmd(pullCmd) @@ -167,7 +167,7 @@ func (s *DockerTrustSuite) TestTrustedPullWithExpiredSnapshot(c *check.C) { // Snapshots last for three years. This should be expired fourYearsLater := time.Now().Add(time.Hour * 24 * 365 * 4) - integration.RunAtDifferentDate(fourYearsLater, func() { + testutil.RunAtDifferentDate(fourYearsLater, func() { // Try pull pullCmd := exec.Command(dockerBinary, "pull", repoName) s.trustedCmd(pullCmd) diff --git a/integration-cli/docker_cli_push_test.go b/integration-cli/docker_cli_push_test.go index 2dec078259..9cbac83f08 100644 --- a/integration-cli/docker_cli_push_test.go +++ b/integration-cli/docker_cli_push_test.go @@ -15,8 +15,8 @@ import ( "github.com/docker/distribution/reference" cliconfig "github.com/docker/docker/cli/config" - "github.com/docker/docker/pkg/integration" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" + "github.com/docker/docker/pkg/testutil" "github.com/go-check/check" ) @@ -438,7 +438,7 @@ func (s *DockerTrustSuite) TestTrustedPushWithExpiredSnapshot(c *check.C) { // Snapshots last for three years. This should be expired fourYearsLater := time.Now().Add(time.Hour * 24 * 365 * 4) - integration.RunAtDifferentDate(fourYearsLater, func() { + testutil.RunAtDifferentDate(fourYearsLater, func() { // Push with wrong passphrases pushCmd = exec.Command(dockerBinary, "push", repoName) s.trustedCmd(pushCmd) @@ -465,7 +465,7 @@ func (s *DockerTrustSuite) TestTrustedPushWithExpiredTimestamp(c *check.C) { threeWeeksLater := time.Now().Add(time.Hour * 24 * 21) // Should succeed because the server transparently re-signs one - integration.RunAtDifferentDate(threeWeeksLater, func() { + testutil.RunAtDifferentDate(threeWeeksLater, func() { pushCmd := exec.Command(dockerBinary, "push", repoName) s.trustedCmd(pushCmd) out, _, err := runCommandWithOutput(pushCmd) diff --git a/integration-cli/docker_cli_rename_test.go b/integration-cli/docker_cli_rename_test.go index 373d614b5e..7371438d1a 100644 --- a/integration-cli/docker_cli_rename_test.go +++ b/integration-cli/docker_cli_rename_test.go @@ -3,9 +3,9 @@ package main import ( "strings" - "github.com/docker/docker/pkg/integration/checker" - icmd "github.com/docker/docker/pkg/integration/cmd" + "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/pkg/stringid" + icmd "github.com/docker/docker/pkg/testutil/cmd" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_restart_test.go b/integration-cli/docker_cli_restart_test.go index d2c5669443..a35eb7d4f6 100644 --- a/integration-cli/docker_cli_restart_test.go +++ b/integration-cli/docker_cli_restart_test.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_rm_test.go b/integration-cli/docker_cli_rm_test.go index 4cc5a1afd2..cce7ec6177 100644 --- a/integration-cli/docker_cli_rm_test.go +++ b/integration-cli/docker_cli_rm_test.go @@ -4,7 +4,7 @@ import ( "io/ioutil" "os" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_rmi_test.go b/integration-cli/docker_cli_rmi_test.go index cb16d9d88c..4c0502ba9c 100644 --- a/integration-cli/docker_cli_rmi_test.go +++ b/integration-cli/docker_cli_rmi_test.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/pkg/stringid" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_run_test.go b/integration-cli/docker_cli_run_test.go index 35f8beddb6..c4e4b44cfe 100644 --- a/integration-cli/docker_cli_run_test.go +++ b/integration-cli/docker_cli_run_test.go @@ -21,12 +21,12 @@ import ( "sync" "time" - "github.com/docker/docker/pkg/integration" - "github.com/docker/docker/pkg/integration/checker" - icmd "github.com/docker/docker/pkg/integration/cmd" + "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/pkg/mount" "github.com/docker/docker/pkg/stringid" "github.com/docker/docker/pkg/stringutils" + "github.com/docker/docker/pkg/testutil" + icmd "github.com/docker/docker/pkg/testutil/cmd" "github.com/docker/docker/runconfig" "github.com/docker/go-connections/nat" "github.com/docker/libnetwork/resolvconf" @@ -498,7 +498,7 @@ func (s *DockerSuite) TestRunVolumesFromInReadWriteMode(c *check.C) { func (s *DockerSuite) TestVolumesFromGetsProperMode(c *check.C) { testRequires(c, SameHostDaemon) prefix, slash := getPrefixAndSlashFromDaemonPlatform() - hostpath := integration.RandomTmpDirPath("test", daemonPlatform) + hostpath := testutil.RandomTmpDirPath("test", daemonPlatform) if err := os.MkdirAll(hostpath, 0755); err != nil { c.Fatalf("Failed to create %s: %q", hostpath, err) } @@ -521,8 +521,8 @@ func (s *DockerSuite) TestVolumesFromGetsProperMode(c *check.C) { // Test for GH#10618 func (s *DockerSuite) TestRunNoDupVolumes(c *check.C) { - path1 := integration.RandomTmpDirPath("test1", daemonPlatform) - path2 := integration.RandomTmpDirPath("test2", daemonPlatform) + path1 := testutil.RandomTmpDirPath("test1", daemonPlatform) + path2 := testutil.RandomTmpDirPath("test2", daemonPlatform) someplace := ":/someplace" if daemonPlatform == "windows" { @@ -2275,7 +2275,7 @@ func (s *DockerSuite) TestVolumesNoCopyData(c *check.C) { c.Fatalf("Data was copied on volumes-from but shouldn't be:\n%q", out) } - tmpDir := integration.RandomTmpDirPath("docker_test_bind_mount_copy_data", daemonPlatform) + tmpDir := testutil.RandomTmpDirPath("docker_test_bind_mount_copy_data", daemonPlatform) if out, _, err := dockerCmdWithError("run", "-v", tmpDir+":/foo", "dataimage", "ls", "-lh", "/foo/bar"); err == nil || !strings.Contains(out, "No such file or directory") { c.Fatalf("Data was copied on bind-mount but shouldn't be:\n%q", out) } @@ -2344,7 +2344,7 @@ func (s *DockerSuite) TestRunSlowStdoutConsumer(c *check.C) { if err := cont.Start(); err != nil { c.Fatal(err) } - n, err := integration.ConsumeWithSpeed(stdout, 10000, 5*time.Millisecond, nil) + n, err := testutil.ConsumeWithSpeed(stdout, 10000, 5*time.Millisecond, nil) if err != nil { c.Fatal(err) } @@ -3326,7 +3326,7 @@ func (s *DockerTrustSuite) TestRunWhenCertExpired(c *check.C) { // Certificates have 10 years of expiration elevenYearsFromNow := time.Now().Add(time.Hour * 24 * 365 * 11) - integration.RunAtDifferentDate(elevenYearsFromNow, func() { + testutil.RunAtDifferentDate(elevenYearsFromNow, func() { // Try run runCmd := exec.Command(dockerBinary, "run", repoName) s.trustedCmd(runCmd) @@ -3340,7 +3340,7 @@ func (s *DockerTrustSuite) TestRunWhenCertExpired(c *check.C) { } }) - integration.RunAtDifferentDate(elevenYearsFromNow, func() { + testutil.RunAtDifferentDate(elevenYearsFromNow, func() { // Try run runCmd := exec.Command(dockerBinary, "run", "--disable-content-trust", repoName) s.trustedCmd(runCmd) @@ -3532,7 +3532,7 @@ func (s *DockerSuite) TestRunContainerWithCgroupParent(c *check.C) { if err != nil { c.Fatalf("unexpected failure when running container with --cgroup-parent option - %s\n%v", string(out), err) } - cgroupPaths := integration.ParseCgroupPaths(string(out)) + cgroupPaths := testutil.ParseCgroupPaths(string(out)) if len(cgroupPaths) == 0 { c.Fatalf("unexpected output - %q", string(out)) } @@ -3561,7 +3561,7 @@ func (s *DockerSuite) TestRunContainerWithCgroupParentAbsPath(c *check.C) { if err != nil { c.Fatalf("unexpected failure when running container with --cgroup-parent option - %s\n%v", string(out), err) } - cgroupPaths := integration.ParseCgroupPaths(string(out)) + cgroupPaths := testutil.ParseCgroupPaths(string(out)) if len(cgroupPaths) == 0 { c.Fatalf("unexpected output - %q", string(out)) } @@ -3600,7 +3600,7 @@ func (s *DockerSuite) TestRunInvalidCgroupParent(c *check.C) { c.Fatalf("SECURITY: --cgroup-parent with ../../ relative paths cause files to be created in the host (this is bad) !!") } - cgroupPaths := integration.ParseCgroupPaths(string(out)) + cgroupPaths := testutil.ParseCgroupPaths(string(out)) if len(cgroupPaths) == 0 { c.Fatalf("unexpected output - %q", string(out)) } @@ -3639,7 +3639,7 @@ func (s *DockerSuite) TestRunAbsoluteInvalidCgroupParent(c *check.C) { c.Fatalf("SECURITY: --cgroup-parent with /../../ garbage paths cause files to be created in the host (this is bad) !!") } - cgroupPaths := integration.ParseCgroupPaths(string(out)) + cgroupPaths := testutil.ParseCgroupPaths(string(out)) if len(cgroupPaths) == 0 { c.Fatalf("unexpected output - %q", string(out)) } diff --git a/integration-cli/docker_cli_run_unix_test.go b/integration-cli/docker_cli_run_unix_test.go index 97f8e826ec..7acefbc9a6 100644 --- a/integration-cli/docker_cli_run_unix_test.go +++ b/integration-cli/docker_cli_run_unix_test.go @@ -16,8 +16,8 @@ import ( "syscall" "time" + "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/pkg/homedir" - "github.com/docker/docker/pkg/integration/checker" "github.com/docker/docker/pkg/mount" "github.com/docker/docker/pkg/parsers" "github.com/docker/docker/pkg/sysinfo" diff --git a/integration-cli/docker_cli_save_load_test.go b/integration-cli/docker_cli_save_load_test.go index 5be695948c..b7d82f74d2 100644 --- a/integration-cli/docker_cli_save_load_test.go +++ b/integration-cli/docker_cli_save_load_test.go @@ -14,8 +14,8 @@ import ( "time" "github.com/docker/distribution/digest" - "github.com/docker/docker/pkg/integration" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" + "github.com/docker/docker/pkg/testutil" "github.com/go-check/check" ) @@ -30,7 +30,7 @@ func (s *DockerSuite) TestSaveXzAndLoadRepoStdout(c *check.C) { dockerCmd(c, "inspect", repoName) - repoTarball, _, err := integration.RunCommandPipelineWithOutput( + repoTarball, _, err := testutil.RunCommandPipelineWithOutput( exec.Command(dockerBinary, "save", repoName), exec.Command("xz", "-c"), exec.Command("gzip", "-c")) @@ -57,7 +57,7 @@ func (s *DockerSuite) TestSaveXzGzAndLoadRepoStdout(c *check.C) { dockerCmd(c, "inspect", repoName) - out, _, err := integration.RunCommandPipelineWithOutput( + out, _, err := testutil.RunCommandPipelineWithOutput( exec.Command(dockerBinary, "save", repoName), exec.Command("xz", "-c"), exec.Command("gzip", "-c")) @@ -82,7 +82,7 @@ func (s *DockerSuite) TestSaveSingleTag(c *check.C) { out, _ := dockerCmd(c, "images", "-q", "--no-trunc", repoName) cleanedImageID := strings.TrimSpace(out) - out, _, err := integration.RunCommandPipelineWithOutput( + out, _, err := testutil.RunCommandPipelineWithOutput( exec.Command(dockerBinary, "save", fmt.Sprintf("%v:latest", repoName)), exec.Command("tar", "t"), exec.Command("grep", "-E", fmt.Sprintf("(^repositories$|%v)", cleanedImageID))) @@ -101,7 +101,7 @@ func (s *DockerSuite) TestSaveCheckTimes(c *check.C) { c.Assert(err, checker.IsNil, check.Commentf("failed to marshal from %q: err %v", repoName, err)) c.Assert(len(data), checker.Not(checker.Equals), 0, check.Commentf("failed to marshal the data from %q", repoName)) tarTvTimeFormat := "2006-01-02 15:04" - out, _, err = integration.RunCommandPipelineWithOutput( + out, _, err = testutil.RunCommandPipelineWithOutput( exec.Command(dockerBinary, "save", repoName), exec.Command("tar", "tv"), exec.Command("grep", "-E", fmt.Sprintf("%s %s", data[0].Created.Format(tarTvTimeFormat), digest.Digest(data[0].ID).Hex()))) @@ -159,7 +159,7 @@ func (s *DockerSuite) TestSaveAndLoadRepoFlags(c *check.C) { before, _ := dockerCmd(c, "inspect", repoName) - out, _, err := integration.RunCommandPipelineWithOutput( + out, _, err := testutil.RunCommandPipelineWithOutput( exec.Command(dockerBinary, "save", repoName), exec.Command(dockerBinary, "load")) c.Assert(err, checker.IsNil, check.Commentf("failed to save and load repo: %s, %v", out, err)) @@ -188,7 +188,7 @@ func (s *DockerSuite) TestSaveMultipleNames(c *check.C) { // Make two images dockerCmd(c, "tag", "emptyfs:latest", fmt.Sprintf("%v-two:latest", repoName)) - out, _, err := integration.RunCommandPipelineWithOutput( + out, _, err := testutil.RunCommandPipelineWithOutput( exec.Command(dockerBinary, "save", fmt.Sprintf("%v-one", repoName), fmt.Sprintf("%v-two:latest", repoName)), exec.Command("tar", "xO", "repositories"), exec.Command("grep", "-q", "-E", "(-one|-two)"), @@ -220,7 +220,7 @@ func (s *DockerSuite) TestSaveRepoWithMultipleImages(c *check.C) { deleteImages(repoName) // create the archive - out, _, err := integration.RunCommandPipelineWithOutput( + out, _, err := testutil.RunCommandPipelineWithOutput( exec.Command(dockerBinary, "save", repoName, "busybox:latest"), exec.Command("tar", "t")) c.Assert(err, checker.IsNil, check.Commentf("failed to save multiple images: %s, %v", out, err)) @@ -267,7 +267,7 @@ func (s *DockerSuite) TestSaveDirectoryPermissions(c *check.C) { true) c.Assert(err, checker.IsNil, check.Commentf("%v", err)) - out, _, err := integration.RunCommandPipelineWithOutput( + out, _, err := testutil.RunCommandPipelineWithOutput( exec.Command(dockerBinary, "save", name), exec.Command("tar", "-xf", "-", "-C", extractionDirectory), ) @@ -286,7 +286,7 @@ func (s *DockerSuite) TestSaveDirectoryPermissions(c *check.C) { c.Assert(err, checker.IsNil, check.Commentf("failed to open %s: %s", layerPath, err)) defer f.Close() - entries, err := integration.ListTar(f) + entries, err := testutil.ListTar(f) for _, e := range entries { if !strings.Contains(e, "dev/") { entriesSansDev = append(entriesSansDev, e) @@ -364,7 +364,7 @@ func (s *DockerSuite) TestSaveLoadNoTag(c *check.C) { id := inspectField(c, name, "Id") // Test to make sure that save w/o name just shows imageID during load - out, _, err := integration.RunCommandPipelineWithOutput( + out, _, err := testutil.RunCommandPipelineWithOutput( exec.Command(dockerBinary, "save", id), exec.Command(dockerBinary, "load")) c.Assert(err, checker.IsNil, check.Commentf("failed to save and load repo: %s, %v", out, err)) @@ -375,7 +375,7 @@ func (s *DockerSuite) TestSaveLoadNoTag(c *check.C) { c.Assert(out, checker.Contains, id) // Test to make sure that save by name shows that name during load - out, _, err = integration.RunCommandPipelineWithOutput( + out, _, err = testutil.RunCommandPipelineWithOutput( exec.Command(dockerBinary, "save", name), exec.Command(dockerBinary, "load")) c.Assert(err, checker.IsNil, check.Commentf("failed to save and load repo: %s, %v", out, err)) diff --git a/integration-cli/docker_cli_save_load_unix_test.go b/integration-cli/docker_cli_save_load_unix_test.go index 49ffff0bc5..50b0ea6a69 100644 --- a/integration-cli/docker_cli_save_load_unix_test.go +++ b/integration-cli/docker_cli_save_load_unix_test.go @@ -11,8 +11,8 @@ import ( "strings" "time" - "github.com/docker/docker/pkg/integration/checker" - icmd "github.com/docker/docker/pkg/integration/cmd" + "github.com/docker/docker/integration-cli/checker" + icmd "github.com/docker/docker/pkg/testutil/cmd" "github.com/go-check/check" "github.com/kr/pty" ) diff --git a/integration-cli/docker_cli_search_test.go b/integration-cli/docker_cli_search_test.go index 5a32f2ab93..2660a969cc 100644 --- a/integration-cli/docker_cli_search_test.go +++ b/integration-cli/docker_cli_search_test.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_secret_create_test.go b/integration-cli/docker_cli_secret_create_test.go index 38d292eec6..1bb93661a1 100644 --- a/integration-cli/docker_cli_secret_create_test.go +++ b/integration-cli/docker_cli_secret_create_test.go @@ -8,7 +8,7 @@ import ( "strings" "github.com/docker/docker/api/types/swarm" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_secret_inspect_test.go b/integration-cli/docker_cli_secret_inspect_test.go index 3a4f0edc8a..32b2ffee95 100644 --- a/integration-cli/docker_cli_secret_inspect_test.go +++ b/integration-cli/docker_cli_secret_inspect_test.go @@ -6,7 +6,7 @@ import ( "encoding/json" "github.com/docker/docker/api/types/swarm" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_service_create_test.go b/integration-cli/docker_cli_service_create_test.go index 0fabd7a267..f6ca6ddafe 100644 --- a/integration-cli/docker_cli_service_create_test.go +++ b/integration-cli/docker_cli_service_create_test.go @@ -10,7 +10,7 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/mount" "github.com/docker/docker/api/types/swarm" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_service_health_test.go b/integration-cli/docker_cli_service_health_test.go index 81df257e56..28481c70af 100644 --- a/integration-cli/docker_cli_service_health_test.go +++ b/integration-cli/docker_cli_service_health_test.go @@ -8,7 +8,7 @@ import ( "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/daemon/cluster/executor/container" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_service_logs_experimental_test.go b/integration-cli/docker_cli_service_logs_experimental_test.go index 0c4adcecfb..ba514fcd7b 100644 --- a/integration-cli/docker_cli_service_logs_experimental_test.go +++ b/integration-cli/docker_cli_service_logs_experimental_test.go @@ -9,7 +9,7 @@ import ( "os/exec" "strings" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_service_scale_test.go b/integration-cli/docker_cli_service_scale_test.go index 29cca2358d..c96fa5cf8f 100644 --- a/integration-cli/docker_cli_service_scale_test.go +++ b/integration-cli/docker_cli_service_scale_test.go @@ -6,7 +6,7 @@ import ( "fmt" "strings" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_service_update_test.go b/integration-cli/docker_cli_service_update_test.go index ccbf3f7635..b561e651af 100644 --- a/integration-cli/docker_cli_service_update_test.go +++ b/integration-cli/docker_cli_service_update_test.go @@ -7,7 +7,7 @@ import ( "fmt" "github.com/docker/docker/api/types/swarm" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_stack_test.go b/integration-cli/docker_cli_stack_test.go index 1ff791bc10..2354e1aafa 100644 --- a/integration-cli/docker_cli_stack_test.go +++ b/integration-cli/docker_cli_stack_test.go @@ -4,7 +4,7 @@ import ( "io/ioutil" "os" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_start_test.go b/integration-cli/docker_cli_start_test.go index f7e1b6e8f9..9eb93fb82f 100644 --- a/integration-cli/docker_cli_start_test.go +++ b/integration-cli/docker_cli_start_test.go @@ -5,8 +5,8 @@ import ( "strings" "time" - "github.com/docker/docker/pkg/integration/checker" - icmd "github.com/docker/docker/pkg/integration/cmd" + "github.com/docker/docker/integration-cli/checker" + icmd "github.com/docker/docker/pkg/testutil/cmd" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_stats_test.go b/integration-cli/docker_cli_stats_test.go index 5cb1a3ea02..56355a5433 100644 --- a/integration-cli/docker_cli_stats_test.go +++ b/integration-cli/docker_cli_stats_test.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_stop_test.go b/integration-cli/docker_cli_stop_test.go index 103d01374c..1be41203b3 100644 --- a/integration-cli/docker_cli_stop_test.go +++ b/integration-cli/docker_cli_stop_test.go @@ -1,7 +1,7 @@ package main import ( - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_swarm_test.go b/integration-cli/docker_cli_swarm_test.go index a67af79998..7308384292 100644 --- a/integration-cli/docker_cli_swarm_test.go +++ b/integration-cli/docker_cli_swarm_test.go @@ -15,8 +15,8 @@ import ( "time" "github.com/docker/docker/api/types/swarm" + "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/integration-cli/daemon" - "github.com/docker/docker/pkg/integration/checker" "github.com/docker/libnetwork/driverapi" "github.com/docker/libnetwork/ipamapi" remoteipam "github.com/docker/libnetwork/ipams/remote/api" diff --git a/integration-cli/docker_cli_swarm_unix_test.go b/integration-cli/docker_cli_swarm_unix_test.go index 96e77e258e..a74426a1fa 100644 --- a/integration-cli/docker_cli_swarm_unix_test.go +++ b/integration-cli/docker_cli_swarm_unix_test.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/docker/docker/api/types/swarm" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_tag_test.go b/integration-cli/docker_cli_tag_test.go index 60b89dca04..7c3a5e2b96 100644 --- a/integration-cli/docker_cli_tag_test.go +++ b/integration-cli/docker_cli_tag_test.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/pkg/stringid" "github.com/docker/docker/pkg/stringutils" "github.com/go-check/check" diff --git a/integration-cli/docker_cli_top_test.go b/integration-cli/docker_cli_top_test.go index caae29024a..6b5c0a06f7 100644 --- a/integration-cli/docker_cli_top_test.go +++ b/integration-cli/docker_cli_top_test.go @@ -3,8 +3,8 @@ package main import ( "strings" - "github.com/docker/docker/pkg/integration/checker" - icmd "github.com/docker/docker/pkg/integration/cmd" + "github.com/docker/docker/integration-cli/checker" + icmd "github.com/docker/docker/pkg/testutil/cmd" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_update_test.go b/integration-cli/docker_cli_update_test.go index 0b31bb45ff..1ab3e5c30c 100644 --- a/integration-cli/docker_cli_update_test.go +++ b/integration-cli/docker_cli_update_test.go @@ -4,7 +4,7 @@ import ( "strings" "time" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_update_unix_test.go b/integration-cli/docker_cli_update_unix_test.go index 580ff02602..99fdba2eeb 100644 --- a/integration-cli/docker_cli_update_unix_test.go +++ b/integration-cli/docker_cli_update_unix_test.go @@ -11,7 +11,7 @@ import ( "time" "github.com/docker/docker/api/types" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/pkg/parsers/kernel" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_userns_test.go b/integration-cli/docker_cli_userns_test.go index a1e862fbcf..8311401d0e 100644 --- a/integration-cli/docker_cli_userns_test.go +++ b/integration-cli/docker_cli_userns_test.go @@ -12,10 +12,10 @@ import ( "strconv" "strings" - "github.com/docker/docker/pkg/integration" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/pkg/stringid" "github.com/docker/docker/pkg/system" + "github.com/docker/docker/pkg/testutil" "github.com/go-check/check" ) @@ -62,12 +62,12 @@ func (s *DockerDaemonSuite) TestDaemonUserNamespaceRootSetting(c *check.C) { c.Assert(err, checker.IsNil, check.Commentf("Could not inspect running container: out: %q", pid)) // check the uid and gid maps for the PID to ensure root is remapped // (cmd = cat /proc//uid_map | grep -E '0\s+9999\s+1') - out, rc1, err := integration.RunCommandPipelineWithOutput( + out, rc1, err := testutil.RunCommandPipelineWithOutput( exec.Command("cat", "/proc/"+strings.TrimSpace(pid)+"/uid_map"), exec.Command("grep", "-E", fmt.Sprintf("0[[:space:]]+%d[[:space:]]+", uid))) c.Assert(rc1, checker.Equals, 0, check.Commentf("Didn't match uid_map: output: %s", out)) - out, rc2, err := integration.RunCommandPipelineWithOutput( + out, rc2, err := testutil.RunCommandPipelineWithOutput( exec.Command("cat", "/proc/"+strings.TrimSpace(pid)+"/gid_map"), exec.Command("grep", "-E", fmt.Sprintf("0[[:space:]]+%d[[:space:]]+", gid))) c.Assert(rc2, checker.Equals, 0, check.Commentf("Didn't match gid_map: output: %s", out)) diff --git a/integration-cli/docker_cli_version_test.go b/integration-cli/docker_cli_version_test.go index 7672beb732..074a7db475 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/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_volume_test.go b/integration-cli/docker_cli_volume_test.go index d9bd000d28..c6e4d1158f 100644 --- a/integration-cli/docker_cli_volume_test.go +++ b/integration-cli/docker_cli_volume_test.go @@ -8,8 +8,8 @@ import ( "path/filepath" "strings" - "github.com/docker/docker/pkg/integration/checker" - icmd "github.com/docker/docker/pkg/integration/cmd" + "github.com/docker/docker/integration-cli/checker" + icmd "github.com/docker/docker/pkg/testutil/cmd" "github.com/go-check/check" ) diff --git a/integration-cli/docker_cli_wait_test.go b/integration-cli/docker_cli_wait_test.go index 961aef5525..577ff3fd9b 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/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_deprecated_api_v124_test.go b/integration-cli/docker_deprecated_api_v124_test.go index a001197176..09e4b61de0 100644 --- a/integration-cli/docker_deprecated_api_v124_test.go +++ b/integration-cli/docker_deprecated_api_v124_test.go @@ -7,8 +7,8 @@ import ( "net/http" "strings" - "github.com/docker/docker/pkg/integration" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" + "github.com/docker/docker/pkg/testutil" "github.com/go-check/check" ) @@ -45,7 +45,7 @@ func (s *DockerSuite) TestDeprecatedContainerAPIStartVolumeBinds(c *check.C) { c.Assert(err, checker.IsNil) c.Assert(status, checker.Equals, http.StatusCreated) - bindPath := integration.RandomTmpDirPath("test", daemonPlatform) + bindPath := testutil.RandomTmpDirPath("test", daemonPlatform) config = map[string]interface{}{ "Binds": []string{bindPath + ":" + path}, } @@ -72,8 +72,8 @@ func (s *DockerSuite) TestDeprecatedContainerAPIStartDupVolumeBinds(c *check.C) c.Assert(err, checker.IsNil) c.Assert(status, checker.Equals, http.StatusCreated) - bindPath1 := integration.RandomTmpDirPath("test1", daemonPlatform) - bindPath2 := integration.RandomTmpDirPath("test2", daemonPlatform) + bindPath1 := testutil.RandomTmpDirPath("test1", daemonPlatform) + bindPath2 := testutil.RandomTmpDirPath("test2", daemonPlatform) config = map[string]interface{}{ "Binds": []string{bindPath1 + ":/tmp", bindPath2 + ":/tmp"}, @@ -151,7 +151,7 @@ func (s *DockerSuite) TestDeprecatedStartWithTooLowMemoryLimit(c *check.C) { res, body, err := sockRequestRaw("POST", formatV123StartAPIURL("/containers/"+containerID+"/start"), strings.NewReader(config), "application/json") c.Assert(err, checker.IsNil) - b, err2 := integration.ReadBody(body) + b, err2 := testutil.ReadBody(body) c.Assert(err2, checker.IsNil) c.Assert(res.StatusCode, checker.Equals, http.StatusInternalServerError) c.Assert(string(b), checker.Contains, "Minimum memory limit allowed is 4MB") diff --git a/integration-cli/docker_deprecated_api_v124_unix_test.go b/integration-cli/docker_deprecated_api_v124_unix_test.go index 94ef9b1a00..d50a521a94 100644 --- a/integration-cli/docker_deprecated_api_v124_unix_test.go +++ b/integration-cli/docker_deprecated_api_v124_unix_test.go @@ -5,7 +5,7 @@ package main import ( "fmt" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_experimental_network_test.go b/integration-cli/docker_experimental_network_test.go index 70b3851f52..b32602aaaf 100644 --- a/integration-cli/docker_experimental_network_test.go +++ b/integration-cli/docker_experimental_network_test.go @@ -7,9 +7,9 @@ import ( "strings" "time" - "github.com/docker/docker/pkg/integration/checker" - icmd "github.com/docker/docker/pkg/integration/cmd" + "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/pkg/parsers/kernel" + icmd "github.com/docker/docker/pkg/testutil/cmd" "github.com/go-check/check" ) diff --git a/integration-cli/docker_hub_pull_suite_test.go b/integration-cli/docker_hub_pull_suite_test.go index 475c371c5b..a01c3d44a8 100644 --- a/integration-cli/docker_hub_pull_suite_test.go +++ b/integration-cli/docker_hub_pull_suite_test.go @@ -5,8 +5,8 @@ import ( "runtime" "strings" + "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/integration-cli/daemon" - "github.com/docker/docker/pkg/integration/checker" "github.com/go-check/check" ) diff --git a/integration-cli/docker_utils_test.go b/integration-cli/docker_utils_test.go index 90939dc7ce..e2b576467e 100644 --- a/integration-cli/docker_utils_test.go +++ b/integration-cli/docker_utils_test.go @@ -23,13 +23,13 @@ import ( "github.com/docker/docker/api/types" volumetypes "github.com/docker/docker/api/types/volume" + "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/integration-cli/daemon" "github.com/docker/docker/opts" - "github.com/docker/docker/pkg/integration" - "github.com/docker/docker/pkg/integration/checker" - icmd "github.com/docker/docker/pkg/integration/cmd" "github.com/docker/docker/pkg/ioutils" "github.com/docker/docker/pkg/stringutils" + "github.com/docker/docker/pkg/testutil" + icmd "github.com/docker/docker/pkg/testutil/cmd" "github.com/go-check/check" ) @@ -59,7 +59,7 @@ func sockRequest(method, endpoint string, data interface{}) (int, []byte, error) if err != nil { return -1, nil, err } - b, err := integration.ReadBody(body) + b, err := testutil.ReadBody(body) return res.StatusCode, b, err } diff --git a/integration-cli/events_utils_test.go b/integration-cli/events_utils_test.go index ba241796b3..9350edcb96 100644 --- a/integration-cli/events_utils_test.go +++ b/integration-cli/events_utils_test.go @@ -11,7 +11,7 @@ import ( "github.com/Sirupsen/logrus" eventstestutils "github.com/docker/docker/daemon/events/testutils" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/go-check/check" ) diff --git a/integration-cli/fixtures_linux_daemon_test.go b/integration-cli/fixtures_linux_daemon_test.go index 58aedfaf3c..63956dbfbf 100644 --- a/integration-cli/fixtures_linux_daemon_test.go +++ b/integration-cli/fixtures_linux_daemon_test.go @@ -10,8 +10,8 @@ import ( "strings" "sync" + "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/integration-cli/fixtures/load" - "github.com/docker/docker/pkg/integration/checker" "github.com/go-check/check" ) diff --git a/integration-cli/trust_server_test.go b/integration-cli/trust_server_test.go index 648efa6a01..a11ccfbdee 100644 --- a/integration-cli/trust_server_test.go +++ b/integration-cli/trust_server_test.go @@ -12,7 +12,7 @@ import ( "time" cliconfig "github.com/docker/docker/cli/config" - "github.com/docker/docker/pkg/integration/checker" + "github.com/docker/docker/integration-cli/checker" "github.com/docker/go-connections/tlsconfig" "github.com/go-check/check" ) diff --git a/integration-cli/utils_test.go b/integration-cli/utils_test.go index 0b5ae9aaf5..4e361cef5f 100644 --- a/integration-cli/utils_test.go +++ b/integration-cli/utils_test.go @@ -1,7 +1,7 @@ package main import ( - "github.com/docker/docker/pkg/integration/cmd" + "github.com/docker/docker/pkg/testutil/cmd" "os/exec" ) diff --git a/pkg/integration/cmd/command.go b/pkg/testutil/cmd/command.go similarity index 100% rename from pkg/integration/cmd/command.go rename to pkg/testutil/cmd/command.go diff --git a/pkg/integration/cmd/command_test.go b/pkg/testutil/cmd/command_test.go similarity index 100% rename from pkg/integration/cmd/command_test.go rename to pkg/testutil/cmd/command_test.go diff --git a/pkg/integration/utils.go b/pkg/testutil/utils.go similarity index 98% rename from pkg/integration/utils.go rename to pkg/testutil/utils.go index af3aa1a910..d0924f8964 100644 --- a/pkg/integration/utils.go +++ b/pkg/testutil/utils.go @@ -1,4 +1,4 @@ -package integration +package testutil import ( "archive/tar" @@ -14,9 +14,9 @@ import ( "syscall" "time" - icmd "github.com/docker/docker/pkg/integration/cmd" "github.com/docker/docker/pkg/stringutils" "github.com/docker/docker/pkg/system" + icmd "github.com/docker/docker/pkg/testutil/cmd" ) // IsKilled process the specified error and returns whether the process was killed or not. diff --git a/pkg/integration/utils_test.go b/pkg/testutil/utils_test.go similarity index 99% rename from pkg/integration/utils_test.go rename to pkg/testutil/utils_test.go index 8e8798d42d..d1dddaffa9 100644 --- a/pkg/integration/utils_test.go +++ b/pkg/testutil/utils_test.go @@ -1,4 +1,4 @@ -package integration +package testutil import ( "io"