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

Skip new ulimits test on lxc

integration-cli/docker_cli_daemon_test.go

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

integration-cli/docker_cli_run_unix_test.go

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