summaryrefslogtreecommitdiff
path: root/integration-cli/docker_cli_commit_test.go
diff options
context:
space:
mode:
authorVincent Demeester <vincent@sbr.pm>2017-03-23 18:35:22 +0100
committerVincent Demeester <vincent@sbr.pm>2017-03-23 18:35:22 +0100
commit50c4475df6304e0cf12ea95217eb00ab5d572e34 (patch)
treef3c44d3a909511772e0ee592a08b11e69094af34 /integration-cli/docker_cli_commit_test.go
parentad530ffee09a4ca6b87a2b009f86b4651653e29a (diff)
downloaddocker-50c4475df6304e0cf12ea95217eb00ab5d572e34.tar.gz
Introduce a `cli` package for test-integration
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Diffstat (limited to 'integration-cli/docker_cli_commit_test.go')
-rw-r--r--integration-cli/docker_cli_commit_test.go9
1 files changed, 5 insertions, 4 deletions
diff --git a/integration-cli/docker_cli_commit_test.go b/integration-cli/docker_cli_commit_test.go
index 9d8b6e620d..bedc358f58 100644
--- a/integration-cli/docker_cli_commit_test.go
+++ b/integration-cli/docker_cli_commit_test.go
@@ -4,21 +4,22 @@ import (
"strings"
"github.com/docker/docker/integration-cli/checker"
+ "github.com/docker/docker/integration-cli/cli"
"github.com/go-check/check"
)
func (s *DockerSuite) TestCommitAfterContainerIsDone(c *check.C) {
- out, _ := dockerCmd(c, "run", "-i", "-a", "stdin", "busybox", "echo", "foo")
+ out := cli.DockerCmd(c, "run", "-i", "-a", "stdin", "busybox", "echo", "foo").Combined()
cleanedContainerID := strings.TrimSpace(out)
- dockerCmd(c, "wait", cleanedContainerID)
+ cli.DockerCmd(c, "wait", cleanedContainerID)
- out, _ = dockerCmd(c, "commit", cleanedContainerID)
+ out = cli.DockerCmd(c, "commit", cleanedContainerID).Combined()
cleanedImageID := strings.TrimSpace(out)
- dockerCmd(c, "inspect", cleanedImageID)
+ cli.DockerCmd(c, "inspect", cleanedImageID)
}
func (s *DockerSuite) TestCommitWithoutPause(c *check.C) {