diff options
| author | Vincent Demeester <vincent@sbr.pm> | 2017-01-16 16:39:12 +0100 |
|---|---|---|
| committer | Vincent Demeester <vincent@sbr.pm> | 2017-01-30 10:54:06 +0100 |
| commit | ecbb0e62f66da7d698c4f4583f36b927d8cfa811 (patch) | |
| tree | 5ccb21489e068e36dc06dfbe1aa7bdb5e18417c9 /integration-cli/docker_cli_cp_test.go | |
| parent | 48dd90d3985889ca008faa3b041bf31d2ada95c5 (diff) | |
| download | docker-ecbb0e62f66da7d698c4f4583f36b927d8cfa811.tar.gz | |
Remove most of the runCommandWithOutput from integration tests
There is 5 calls left, that use StdinPipe that is not yet supported by
icmd.
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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/integration-cli/docker_cli_cp_test.go b/integration-cli/docker_cli_cp_test.go index e9300654e6..80dc56289f 100644 --- a/integration-cli/docker_cli_cp_test.go +++ b/integration-cli/docker_cli_cp_test.go @@ -422,7 +422,7 @@ func (s *DockerSuite) TestCpSpecialFiles(c *check.C) { // Copy actual /etc/resolv.conf dockerCmd(c, "cp", containerID+":/etc/resolv.conf", outDir) - expected, err := readContainerFile(containerID, "resolv.conf") + expected := readContainerFile(c, containerID, "resolv.conf") actual, err := ioutil.ReadFile(outDir + "/resolv.conf") // Expected copied file to be duplicate of the container resolvconf @@ -431,7 +431,7 @@ func (s *DockerSuite) TestCpSpecialFiles(c *check.C) { // Copy actual /etc/hosts dockerCmd(c, "cp", containerID+":/etc/hosts", outDir) - expected, err = readContainerFile(containerID, "hosts") + expected = readContainerFile(c, containerID, "hosts") actual, err = ioutil.ReadFile(outDir + "/hosts") // Expected copied file to be duplicate of the container hosts @@ -440,7 +440,7 @@ func (s *DockerSuite) TestCpSpecialFiles(c *check.C) { // Copy actual /etc/resolv.conf dockerCmd(c, "cp", containerID+":/etc/hostname", outDir) - expected, err = readContainerFile(containerID, "hostname") + expected = readContainerFile(c, containerID, "hostname") actual, err = ioutil.ReadFile(outDir + "/hostname") c.Assert(err, checker.IsNil) |