Browse code
Fixes some integration-cli on userns
Mainly adding requirements on Network or NotUserNamespace to make it pass.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Vincent Demeester authored on 2016/11/23 22:03:53Showing 4 changed files
- integration-cli/docker_cli_events_test.go
- integration-cli/docker_cli_plugins_test.go
- integration-cli/docker_cli_run_test.go
- integration-cli/docker_cli_run_unix_test.go
| ... | ... |
@@ -143,7 +143,7 @@ func (s *DockerSuite) TestPluginInstallArgs(c *check.C) {
|
| 143 | 143 |
} |
| 144 | 144 |
|
| 145 | 145 |
func (s *DockerSuite) TestPluginInstallImage(c *check.C) {
|
| 146 |
- testRequires(c, DaemonIsLinux) |
|
| 146 |
+ testRequires(c, DaemonIsLinux, Network) |
|
| 147 | 147 |
out, _, err := dockerCmdWithError("plugin", "install", "redis")
|
| 148 | 148 |
c.Assert(err, checker.NotNil) |
| 149 | 149 |
c.Assert(out, checker.Contains, "content is not a plugin") |
| ... | ... |
@@ -4570,7 +4570,7 @@ func (s *DockerSuite) TestRunServicingContainer(c *check.C) {
|
| 4570 | 4570 |
} |
| 4571 | 4571 |
|
| 4572 | 4572 |
func (s *DockerSuite) TestRunDuplicateMount(c *check.C) {
|
| 4573 |
- testRequires(c, SameHostDaemon, DaemonIsLinux) |
|
| 4573 |
+ testRequires(c, SameHostDaemon, DaemonIsLinux, NotUserNamespace) |
|
| 4574 | 4574 |
|
| 4575 | 4575 |
tmpFile, err := ioutil.TempFile("", "touch-me")
|
| 4576 | 4576 |
c.Assert(err, checker.IsNil) |
| ... | ... |
@@ -1312,7 +1312,7 @@ func (s *DockerSuite) TestUserNoEffectiveCapabilitiesChroot(c *check.C) {
|
| 1312 | 1312 |
} |
| 1313 | 1313 |
|
| 1314 | 1314 |
func (s *DockerSuite) TestUserNoEffectiveCapabilitiesMknod(c *check.C) {
|
| 1315 |
- testRequires(c, DaemonIsLinux) |
|
| 1315 |
+ testRequires(c, DaemonIsLinux, NotUserNamespace) |
|
| 1316 | 1316 |
ensureSyscallTest(c) |
| 1317 | 1317 |
|
| 1318 | 1318 |
// test that a root user has default capability CAP_MKNOD |