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

Merge pull request #11156 from jfrazelle/ulimit-skip-lxc

Browse Source 
Skip new ulimits test on lxc
Upstream-commit: 27acf7b4acf8efbda8ee6dc6b920db18292d11cd
Component: engine
This commit is contained in:
Michael Crosby
2015-03-05 12:18:52 -08:00
parent 9984f3e27c 24ea69329f
commit cbcbd07469
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
components/engine/integration-cli/docker_cli_daemon_test.go
View File

@ -482,6 +482,7 @@ func TestDaemonUpgradeWithVolumes(t *testing.T) {
}
func TestDaemonUlimitDefaults(t *testing.T) {
testRequires(t, NativeExecDriver)
d := NewDaemon(t)
if err := d.StartWithBusybox("--default-ulimit", "nofile=42:42", "--default-ulimit", "nproc=1024:1024"); err != nil {

1
components/engine/integration-cli/docker_cli_run_unix_test.go
View File

@ -93,6 +93,7 @@ func TestRunWithVolumesIsRecursive(t *testing.T) {
}
func TestRunWithUlimits(t *testing.T) {
testRequires(t, NativeExecDriver)
defer deleteAllContainers()
out, _, err := runCommandWithOutput(exec.Command(dockerBinary, "run", "--name=testulimits", "--ulimit", "nofile=42", "busybox", "/bin/sh", "-c", "ulimit -n"))
if err != nil {