mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Return container exit code with start -a/-i
Addresses #8555 Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
This commit is contained in:
parent
528c15afed
commit
65edb07065
2 changed files with 44 additions and 3 deletions
|
@ -1,7 +1,9 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"os/exec"
|
||||
"strings"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
@ -36,3 +38,33 @@ func TestStartAttachReturnsOnError(t *testing.T) {
|
|||
|
||||
logDone("start - error on start with attach exits")
|
||||
}
|
||||
|
||||
// gh#8555: Exit code should be passed through when using start -a
|
||||
func TestStartAttachCorrectExitCode(t *testing.T) {
|
||||
defer deleteAllContainers()
|
||||
|
||||
runCmd := exec.Command(dockerBinary, "run", "-d", "busybox", "sh", "-c", "sleep 2; exit 1")
|
||||
out, _, _, err := runCommandWithStdoutStderr(runCmd)
|
||||
if err != nil {
|
||||
t.Fatalf("failed to run container: %v, output: %q", err, out)
|
||||
}
|
||||
|
||||
out = stripTrailingCharacters(out)
|
||||
|
||||
// make sure the container has exited before trying the "start -a"
|
||||
waitCmd := exec.Command(dockerBinary, "wait", out)
|
||||
if out, _, err = runCommandWithOutput(waitCmd); err != nil {
|
||||
t.Fatal(out, err)
|
||||
}
|
||||
|
||||
startCmd := exec.Command(dockerBinary, "start", "-a", out)
|
||||
startOut, exitCode, err := runCommandWithOutput(startCmd)
|
||||
if err != nil && !strings.Contains("exit status 1", fmt.Sprintf("%s", err)) {
|
||||
t.Fatalf("start command failed unexpectedly with error: %v, output: %q", err, startOut)
|
||||
}
|
||||
if exitCode != 1 {
|
||||
t.Fatalf("start -a did not respond with proper exit code: expected 1, got %d", exitCode)
|
||||
}
|
||||
|
||||
logDone("start - correct exit code returned with -a")
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue