From 5b2291ae915fc2e034f16404d0786fd9b32c7587 Mon Sep 17 00:00:00 2001 From: Eric Windisch Date: Wed, 7 Oct 2015 14:54:39 -0400 Subject: [PATCH 1/3] Revert "Skip TestRunUnshareProc" This reverts commit 03dce24137c82caa04c215d983eac06a3edc084c. Signed-off-by: Eric Windisch Upstream-commit: 1bf5fcd911a7f773a1f6c7511e977d87cca5b391 Component: engine --- components/engine/integration-cli/docker_cli_run_test.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/components/engine/integration-cli/docker_cli_run_test.go b/components/engine/integration-cli/docker_cli_run_test.go index 02f268fb85..62367bb7c8 100644 --- a/components/engine/integration-cli/docker_cli_run_test.go +++ b/components/engine/integration-cli/docker_cli_run_test.go @@ -2853,8 +2853,6 @@ func (s *DockerSuite) TestMountIntoSys(c *check.C) { } func (s *DockerSuite) TestRunUnshareProc(c *check.C) { - c.Skip("unstable test: is apparmor in a container reliable?") - // Not applicable on Windows as uses Unix specific functionality testRequires(c, Apparmor, DaemonIsLinux) From 99449052ad76f89271ac056d15f96b1756c25a3d Mon Sep 17 00:00:00 2001 From: Eric Windisch Date: Wed, 7 Oct 2015 14:54:40 -0400 Subject: [PATCH 2/3] Revert "Skip TestAppArmorDeniesChmodProc" This reverts commit 04e1015aa06785210dc6a3e4d4ad66700a8d51b0. Signed-off-by: Eric Windisch Upstream-commit: 0df0b6b44300896d82127fac628a1021c25ef861 Component: engine --- components/engine/integration-cli/docker_cli_run_test.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/components/engine/integration-cli/docker_cli_run_test.go b/components/engine/integration-cli/docker_cli_run_test.go index 62367bb7c8..bbf15d9bd2 100644 --- a/components/engine/integration-cli/docker_cli_run_test.go +++ b/components/engine/integration-cli/docker_cli_run_test.go @@ -3232,8 +3232,6 @@ func (s *DockerSuite) TestAppArmorTraceSelf(c *check.C) { } func (s *DockerSuite) TestAppArmorDeniesChmodProc(c *check.C) { - c.Skip("Test is failing, and what it tests is unclear") - // Not applicable on Windows as uses Unix specific functionality testRequires(c, SameHostDaemon, Apparmor, DaemonIsLinux) _, exitCode, _ := dockerCmdWithError("run", "busybox", "chmod", "744", "/proc/cpuinfo") From 265a183ad68394483672da074e18e48f96075057 Mon Sep 17 00:00:00 2001 From: Alexander Morozov Date: Tue, 17 Nov 2015 11:49:31 -0800 Subject: [PATCH 3/3] Skip apparmor tests on User Namespace Signed-off-by: Alexander Morozov Upstream-commit: 70ce2d9b10e7119218ccf10a9b83d86acd2b1ed6 Component: engine --- components/engine/integration-cli/docker_cli_run_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/engine/integration-cli/docker_cli_run_test.go b/components/engine/integration-cli/docker_cli_run_test.go index bbf15d9bd2..a2ada2f160 100644 --- a/components/engine/integration-cli/docker_cli_run_test.go +++ b/components/engine/integration-cli/docker_cli_run_test.go @@ -2854,7 +2854,7 @@ func (s *DockerSuite) TestMountIntoSys(c *check.C) { func (s *DockerSuite) TestRunUnshareProc(c *check.C) { // Not applicable on Windows as uses Unix specific functionality - testRequires(c, Apparmor, DaemonIsLinux) + testRequires(c, Apparmor, DaemonIsLinux, NotUserNamespace) name := "acidburn" if out, _, err := dockerCmdWithError("run", "--name", name, "jess/unshare", "unshare", "-p", "-m", "-f", "-r", "--mount-proc=/proc", "mount"); err == nil || !strings.Contains(out, "Permission denied") { @@ -3233,7 +3233,7 @@ func (s *DockerSuite) TestAppArmorTraceSelf(c *check.C) { func (s *DockerSuite) TestAppArmorDeniesChmodProc(c *check.C) { // Not applicable on Windows as uses Unix specific functionality - testRequires(c, SameHostDaemon, Apparmor, DaemonIsLinux) + testRequires(c, SameHostDaemon, Apparmor, DaemonIsLinux, NotUserNamespace) _, exitCode, _ := dockerCmdWithError("run", "busybox", "chmod", "744", "/proc/cpuinfo") if exitCode == 0 { // If our test failed, attempt to repair the host system...