toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions 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>
Upstream-commit: 621b601b3c602aab5ef0f07903fdf413881bb261
Component: engine
This commit is contained in:
bobby abbott
2015-04-13 22:16:19 -07:00
parent a2f522bead
commit 5e15f55a29
16 changed files with 127 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/engine/integration-cli/docker_cli_links_test.go
View File

@ -110,9 +110,9 @@ func TestLinksPingLinkedContainers(t *testing.T) {
func TestLinksPingLinkedContainersAfterRename(t *testing.T) {
defer deleteAllContainers()
out, _, _ := dockerCmd(t, "run", "-d", "--name", "container1", "busybox", "top")
out, _ := dockerCmd(t, "run", "-d", "--name", "container1", "busybox", "top")
idA := strings.TrimSpace(out)
out, _, _ = dockerCmd(t, "run", "-d", "--name", "container2", "busybox", "top")
out, _ = dockerCmd(t, "run", "-d", "--name", "container2", "busybox", "top")
idB := strings.TrimSpace(out)
dockerCmd(t, "rename", "container1", "container_new")
dockerCmd(t, "run", "--rm", "--link", "container_new:alias1", "--link", "container2:alias2", "busybox", "sh", "-c", "ping -c 1 alias1 -W 1 && ping -c 1 alias2 -W 1")