clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-05 13:11:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed unnecessary error output from dockerCmd

Browse Source 
Changed method declaration. Fixed all calls to dockerCmd
method to reflect the change.

resolves #12355

Signed-off-by: bobby abbott <ttobbaybbob@gmail.com>
This commit is contained in:
bobby abbott
2015-04-17 09:11:14 -07:00
parent 24af878358
commit 621b601b3c
16 changed files with 127 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration-cli/docker_cli_commit_test.go
+2 -2
View File
@@ -284,13 +284,13 @@ func TestCommitChange(t *testing.T) {
func TestCommitMergeConfigRun(t *testing.T) {
defer deleteAllContainers()
name := "commit-test"
out, _, _ := dockerCmd(t, "run", "-d", "-e=FOO=bar", "busybox", "/bin/sh", "-c", "echo testing > /tmp/foo")
out, _ := dockerCmd(t, "run", "-d", "-e=FOO=bar", "busybox", "/bin/sh", "-c", "echo testing > /tmp/foo")
id := strings.TrimSpace(out)
dockerCmd(t, "commit", `--run={"Cmd": ["cat", "/tmp/foo"]}`, id, "commit-test")
defer deleteImages("commit-test")
out, _, _ = dockerCmd(t, "run", "--name", name, "commit-test")
out, _ = dockerCmd(t, "run", "--name", name, "commit-test")
if strings.TrimSpace(out) != "testing" {
t.Fatal("run config in commited container was not merged")
}