toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #12466 from robertabbott/fix_dockerCmd

Browse Source 
Removed unnecessary error output from dockerCmd
Upstream-commit: 5fd378c0d1d97601c7cfab6a62bb8da031a0001d
Component: engine
This commit is contained in:
Arnaud Porterie
2015-04-17 15:15:34 -07:00
parent ad230ae4a5 5e15f55a29
commit ad529b2798
16 changed files with 127 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/integration-cli/docker_cli_run_test.go
+5 -13
View File
@@ -501,9 +501,7 @@ func TestRunCreateVolumesInSymlinkDir(t *testing.T) {
}
defer deleteImages(name)
if out, _, err := dockerCmd(t, "run", "-v", "/test/test", name); err != nil {
t.Fatal(err, out)
}
dockerCmd(t, "run", "-v", "/test/test", name)
logDone("run - create volume in symlink directory")
}
@@ -1058,9 +1056,9 @@ func TestRunLoopbackWhenNetworkDisabled(t *testing.T) {
func TestRunNetHostNotAllowedWithLinks(t *testing.T) {
defer deleteAllContainers()
_, _, err := dockerCmd(t, "run", "--name", "linked", "busybox", "true")
_, _ = dockerCmd(t, "run", "--name", "linked", "busybox", "true")
cmd := exec.Command(dockerBinary, "run", "--net=host", "--link", "linked:linked", "busybox", "true")
_, _, err = runCommandWithOutput(cmd)
_, _, err := runCommandWithOutput(cmd)
if err == nil {
t.Fatal("Expected error")
}
@@ -1493,10 +1491,7 @@ func TestRunModeHostname(t *testing.T) {
func TestRunRootWorkdir(t *testing.T) {
defer deleteAllContainers()
s, _, err := dockerCmd(t, "run", "--workdir", "/", "busybox", "pwd")
if err != nil {
t.Fatal(s, err)
}
s, _ := dockerCmd(t, "run", "--workdir", "/", "busybox", "pwd")
if s != "/\n" {
t.Fatalf("pwd returned %q (expected /\\n)", s)
}
@@ -1507,10 +1502,7 @@ func TestRunRootWorkdir(t *testing.T) {
func TestRunAllowBindMountingRoot(t *testing.T) {
defer deleteAllContainers()
s, _, err := dockerCmd(t, "run", "-v", "/:/host", "busybox", "ls", "/host")
if err != nil {
t.Fatal(s, err)
}
_, _ = dockerCmd(t, "run", "-v", "/:/host", "busybox", "ls", "/host")
logDone("run - bind mount / as volume")
}