beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #11975 from duglin/FixOOMTest

Browse source 
Increase timeout on TestRunOOMExitCode test
This commit is contained in:
Michael Crosby 2015-03-31 17:24:26 -07:00
commit 98cfa2aecd
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
integration-cli/docker_cli_run_test.go
View file

@ -3281,7 +3281,7 @@ func TestRunOOMExitCode(t *testing.T) {
go func() {
defer close(done)
runCmd := exec.Command(dockerBinary, "run", "-m", "4MB", "busybox", "sh", "-c", "x=a; while true; do x=$x$x; done")
runCmd := exec.Command(dockerBinary, "run", "-m", "4MB", "busybox", "sh", "-c", "x=a; while true; do x=$x$x$x$x; done")
out, exitCode, _ := runCommandWithOutput(runCmd)
if expected := 137; exitCode != expected {
t.Fatalf("wrong exit code for OOM container: expected %d, got %d (output: %q)", expected, exitCode, out)
@ -3290,7 +3290,7 @@ func TestRunOOMExitCode(t *testing.T) {
select {
case <-done:
case <-time.After(3 * time.Second):
case <-time.After(30 * time.Second):
t.Fatal("Timeout waiting for container to die on OOM")
}