Browse Source

Merge pull request #32076 from tmp6154/master

Bump up nproc in TestExecUlimits
Vincent Demeester 8 years ago
parent
commit
3fb84ca2f5
1 changed files with 3 additions and 3 deletions
  1. 3 3
      integration-cli/docker_cli_exec_test.go

+ 3 - 3
integration-cli/docker_cli_exec_test.go

@@ -491,12 +491,12 @@ func (s *DockerSuite) TestExecOnReadonlyContainer(c *check.C) {
 func (s *DockerSuite) TestExecUlimits(c *check.C) {
 func (s *DockerSuite) TestExecUlimits(c *check.C) {
 	testRequires(c, DaemonIsLinux)
 	testRequires(c, DaemonIsLinux)
 	name := "testexeculimits"
 	name := "testexeculimits"
-	runSleepingContainer(c, "-d", "--ulimit", "nproc=21", "--name", name)
+	runSleepingContainer(c, "-d", "--ulimit", "nofile=511:511", "--name", name)
 	c.Assert(waitRun(name), checker.IsNil)
 	c.Assert(waitRun(name), checker.IsNil)
 
 
-	out, _, err := dockerCmdWithError("exec", name, "sh", "-c", "ulimit -p")
+	out, _, err := dockerCmdWithError("exec", name, "sh", "-c", "ulimit -n")
 	c.Assert(err, checker.IsNil)
 	c.Assert(err, checker.IsNil)
-	c.Assert(strings.TrimSpace(out), checker.Equals, "21")
+	c.Assert(strings.TrimSpace(out), checker.Equals, "511")
 }
 }
 
 
 // #15750
 // #15750