0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Skip new ulimits test on lxc
This commit is contained in:
Michael Crosby 2015-03-05 12:18:52 -08:00
commit 27acf7b4ac
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
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
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 {