Skip to content

Commit ca25df3

Browse files
authored
Merge pull request moby#37194 from AntaresS/fix-test-failure
fix a failed test
2 parents 5037c5a + 1d9973c commit ca25df3

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

integration-cli/docker_cli_run_unix_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -619,7 +619,8 @@ func (s *DockerSuite) TestRunOOMExitCode(c *check.C) {
619619
errChan := make(chan error)
620620
go func() {
621621
defer close(errChan)
622-
out, exitCode, _ := dockerCmdWithError("run", "-m", "4MB", "busybox", "sh", "-c", "x=a; while true; do x=$x$x$x$x; done")
622+
// memory limit lower than 8MB will raise an error of "device or resource busy" from docker-runc.
623+
out, exitCode, _ := dockerCmdWithError("run", "-m", "8MB", "busybox", "sh", "-c", "x=a; while true; do x=$x$x$x$x; done")
623624
if expected := 137; exitCode != expected {
624625
errChan <- fmt.Errorf("wrong exit code for OOM container: expected %d, got %d (output: %q)", expected, exitCode, out)
625626
}

0 commit comments

Comments
 (0)