From 24ea69329ff88deffad93e77d8f0324cb617f9e8 Mon Sep 17 00:00:00 2001 From: Jessica Frazelle Date: Wed, 4 Mar 2015 07:10:56 -0800 Subject: [PATCH] Skip new ulimits test on lxc Docker-DCO-1.1-Signed-off-by: Jessica Frazelle (github: jfrazelle) Upstream-commit: 80d585b0c7f3b48e6d2342d63f9e5b41cd3c3fdb Component: engine --- components/engine/integration-cli/docker_cli_daemon_test.go | 1 + components/engine/integration-cli/docker_cli_run_unix_test.go | 1 + 2 files changed, 2 insertions(+) diff --git a/components/engine/integration-cli/docker_cli_daemon_test.go b/components/engine/integration-cli/docker_cli_daemon_test.go index 302aade33e..31f55296a4 100644 --- a/components/engine/integration-cli/docker_cli_daemon_test.go +++ b/components/engine/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 { diff --git a/components/engine/integration-cli/docker_cli_run_unix_test.go b/components/engine/integration-cli/docker_cli_run_unix_test.go index 98abce7d0c..477325bf55 100644 --- a/components/engine/integration-cli/docker_cli_run_unix_test.go +++ b/components/engine/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 {