0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #18046 from LK4D4/carry_16822

Browse source 
Revert AppArmor skip tests
This commit is contained in:
David Calavera 2015-11-18 10:37:53 +01:00
commit 7179c89943
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
integration-cli/docker_cli_run_test.go
View file

@ -2853,10 +2853,8 @@ 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)
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") {
@ -3234,10 +3232,8 @@ 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)
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...