Browse code

Merge pull request #32076 from tmp6154/master

Bump up nproc in TestExecUlimits

Vincent Demeester authored on 2017/04/04 05:30:28
Showing 1 changed files
... ...
@@ -491,12 +491,12 @@ func (s *DockerSuite) TestExecOnReadonlyContainer(c *check.C) {
491 491
 func (s *DockerSuite) TestExecUlimits(c *check.C) {
492 492
 	testRequires(c, DaemonIsLinux)
493 493
 	name := "testexeculimits"
494
-	runSleepingContainer(c, "-d", "--ulimit", "nproc=21", "--name", name)
494
+	runSleepingContainer(c, "-d", "--ulimit", "nofile=511:511", "--name", name)
495 495
 	c.Assert(waitRun(name), checker.IsNil)
496 496
 
497
-	out, _, err := dockerCmdWithError("exec", name, "sh", "-c", "ulimit -p")
497
+	out, _, err := dockerCmdWithError("exec", name, "sh", "-c", "ulimit -n")
498 498
 	c.Assert(err, checker.IsNil)
499
-	c.Assert(strings.TrimSpace(out), checker.Equals, "21")
499
+	c.Assert(strings.TrimSpace(out), checker.Equals, "511")
500 500
 }
501 501
 
502 502
 // #15750