toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #32076 from tmp6154/master

Browse Source 
Bump up nproc in TestExecUlimits
Upstream-commit: 3fb84ca2f51c6f544797d8a84b11180f829f8e15
Component: engine
This commit is contained in:
Vincent Demeester
2017-04-03 22:30:28 +02:00
committed by GitHub
parent 8796370b47 291e5291fe
commit 8b68d758b1
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/integration-cli/docker_cli_exec_test.go
+3 -3
View File
@@ -491,12 +491,12 @@ func (s *DockerSuite) TestExecOnReadonlyContainer(c *check.C) {
func (s *DockerSuite) TestExecUlimits(c *check.C) {
testRequires(c, DaemonIsLinux)
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)
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(strings.TrimSpace(out), checker.Equals, "21")
c.Assert(strings.TrimSpace(out), checker.Equals, "511")
}
// #15750