summaryrefslogtreecommitdiff
path: root/integration-cli/docker_cli_cp_test.go
diff options
context:
space:
mode:
authorVincent Demeester <vincent@sbr.pm>2016-12-13 21:21:51 +0100
committerVincent Demeester <vincent@sbr.pm>2016-12-28 19:05:48 +0100
commitdef13fa23c812d367e3c61d9c39bdcee66929c17 (patch)
treebffd757b61c3d67762c91e9e4d93c69e9379b979 /integration-cli/docker_cli_cp_test.go
parent1dece339c3aed9745e5bfe858088a26969a2ee9b (diff)
downloaddocker-def13fa23c812d367e3c61d9c39bdcee66929c17.tar.gz
Clean integration-cli/utils.go from most of its content
Most of the code is now on pkg/integration. 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.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/integration-cli/docker_cli_cp_test.go b/integration-cli/docker_cli_cp_test.go
index 4e5c39e998..4badeb1200 100644
--- a/integration-cli/docker_cli_cp_test.go
+++ b/integration-cli/docker_cli_cp_test.go
@@ -10,6 +10,7 @@ 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/go-check/check"
@@ -545,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 := runCommandPipelineWithOutput(
+ out, _, err := integration.RunCommandPipelineWithOutput(
exec.Command(dockerBinary, "cp", containerID+":/test", "-"),
exec.Command("tar", "-vtf", "-"))