浏览代码

Skip apparmor tests on User Namespace

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Alexander Morozov 9 年之前
父节点
当前提交
70ce2d9b10
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      integration-cli/docker_cli_run_test.go

+ 2 - 2
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) {
 func (s *DockerSuite) TestRunUnshareProc(c *check.C) {
 	// Not applicable on Windows as uses Unix specific functionality
 	// Not applicable on Windows as uses Unix specific functionality
-	testRequires(c, Apparmor, DaemonIsLinux)
+	testRequires(c, Apparmor, DaemonIsLinux, NotUserNamespace)
 
 
 	name := "acidburn"
 	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") {
 	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) {
 func (s *DockerSuite) TestAppArmorDeniesChmodProc(c *check.C) {
 	// Not applicable on Windows as uses Unix specific functionality
 	// 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")
 	_, exitCode, _ := dockerCmdWithError("run", "busybox", "chmod", "744", "/proc/cpuinfo")
 	if exitCode == 0 {
 	if exitCode == 0 {
 		// If our test failed, attempt to repair the host system...
 		// If our test failed, attempt to repair the host system...