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

Merge pull request #15193 from jfrazelle/fix-lxc

Browse Source 
fix lxc test machine
Upstream-commit: 1032202b88145478c2206873056497a03a758bb9
Component: engine
This commit is contained in:
Tibor Vass
2015-07-31 09:13:52 -04:00
parent 8b2de70434 4d212c22a0
commit 2f7ecc6177
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/engine/integration-cli/docker_cli_run_test.go
View File

@ -2756,8 +2756,7 @@ func (s *DockerSuite) TestPtraceContainerProcsFromHost(c *check.C) {
}
func (s *DockerSuite) TestAppArmorDeniesPtrace(c *check.C) {
testRequires(c, SameHostDaemon)
testRequires(c, Apparmor)
testRequires(c, SameHostDaemon, NativeExecDriver, Apparmor)
// Run through 'sh' so we are NOT pid 1. Pid 1 may be able to trace
// itself, but pid>1 should not be able to trace pid1.