kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Make sure to set error reguardless of attach or stdin

Browse source 
Fixes #3364
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
This commit is contained in:
Michael Crosby 2014-03-31 18:21:07 +00:00
parent 1805ef1ccc
commit 51d9a04f17
2 changed files with 35 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
api/client/commands.go
View file

@ -607,8 +607,8 @@ func (cli *DockerCli) CmdStart(args ...string) error {
if err != nil {
if !*attach || !*openStdin {
fmt.Fprintf(cli.err, "%s\n", err)
encounteredError = fmt.Errorf("Error: failed to start one or more containers")
}
encounteredError = fmt.Errorf("Error: failed to start one or more containers")
} else {
if !*attach || !*openStdin {
fmt.Fprintf(cli.out, "%s\n", name)

34
integration-cli/docker_cli_start_test.go Normal file
View file

@ -0,0 +1,34 @@
package main
import (
"os/exec"
"testing"
)
// Regression test for #3364
func TestDockerStartWithPortCollision(t *testing.T) {
runCmd := exec.Command(dockerBinary, "run", "--name", "fail", "-p", "25:25", "busybox", "true")
out, stderr, exitCode, err := runCommandWithStdoutStderr(runCmd)
if err != nil && exitCode != 0 {
t.Fatal(out, stderr, err)
}
runCmd = exec.Command(dockerBinary, "run", "--name", "conflict", "-dti", "-p", "25:25", "busybox", "sh")
out, stderr, exitCode, err = runCommandWithStdoutStderr(runCmd)
if err != nil && exitCode != 0 {
t.Fatal(out, stderr, err)
}
startCmd := exec.Command(dockerBinary, "start", "-a", "fail")
out, stderr, exitCode, err = runCommandWithStdoutStderr(startCmd)
if err != nil && exitCode != 1 {
t.Fatal(out, err)
}
killCmd := exec.Command(dockerBinary, "kill", "conflict")
runCommand(killCmd)
deleteAllContainers()
logDone("start - -a=true error on port use")
}