|
...
|
...
|
@@ -2853,10 +2853,8 @@ func (s *DockerSuite) TestMountIntoSys(c *check.C) {
|
|
2853
|
2853
|
}
|
|
2854
|
2854
|
|
|
2855
|
2855
|
func (s *DockerSuite) TestRunUnshareProc(c *check.C) {
|
|
2856
|
|
- c.Skip("unstable test: is apparmor in a container reliable?")
|
|
2857
|
|
-
|
|
2858
|
2856
|
// Not applicable on Windows as uses Unix specific functionality
|
|
2859
|
|
- testRequires(c, Apparmor, DaemonIsLinux)
|
|
|
2857
|
+ testRequires(c, Apparmor, DaemonIsLinux, NotUserNamespace)
|
|
2860
|
2858
|
|
|
2861
|
2859
|
name := "acidburn"
|
|
2862
|
2860
|
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") {
|
|
...
|
...
|
@@ -3234,10 +3232,8 @@ func (s *DockerSuite) TestAppArmorTraceSelf(c *check.C) {
|
|
3234
|
3234
|
}
|
|
3235
|
3235
|
|
|
3236
|
3236
|
func (s *DockerSuite) TestAppArmorDeniesChmodProc(c *check.C) {
|
|
3237
|
|
- c.Skip("Test is failing, and what it tests is unclear")
|
|
3238
|
|
-
|
|
3239
|
3237
|
// Not applicable on Windows as uses Unix specific functionality
|
|
3240
|
|
- testRequires(c, SameHostDaemon, Apparmor, DaemonIsLinux)
|
|
|
3238
|
+ testRequires(c, SameHostDaemon, Apparmor, DaemonIsLinux, NotUserNamespace)
|
|
3241
|
3239
|
_, exitCode, _ := dockerCmdWithError("run", "busybox", "chmod", "744", "/proc/cpuinfo")
|
|
3242
|
3240
|
if exitCode == 0 {
|
|
3243
|
3241
|
// If our test failed, attempt to repair the host system...
|