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

Skip apparmor tests on User Namespace

Browse Source 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 70ce2d9b10e7119218ccf10a9b83d86acd2b1ed6
Component: engine
This commit is contained in:
Alexander Morozov
2015-11-17 11:49:31 -08:00
parent 99449052ad
commit 265a183ad6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/integration-cli/docker_cli_run_test.go
+2 -2
View File
@@ -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...