diff options
| author | Vincent Demeester <vincent@sbr.pm> | 2016-12-30 18:23:00 +0100 |
|---|---|---|
| committer | Vincent Demeester <vincent@sbr.pm> | 2016-12-30 18:26:34 +0100 |
| commit | 33968e6c7df164fff0a882c50ae7f4f7e6190e4b (patch) | |
| tree | 582c9ef712a844a31465b695bc0d1ae8872909b0 /integration-cli/docker_cli_cp_test.go | |
| parent | 5374d53322abd6a5b2ebb34b7422abc26d1b5eb3 (diff) | |
| download | docker-33968e6c7df164fff0a882c50ae7f4f7e6190e4b.tar.gz | |
Remove pkg/integration and move it to testutil or integration-cli
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Diffstat (limited to 'integration-cli/docker_cli_cp_test.go')
| -rw-r--r-- | integration-cli/docker_cli_cp_test.go | 8 |
1 files changed, 4 insertions, 4 deletions
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", "-")) |