From 833f3b3cf088f4610a2024071a809cec52cdfcbd Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Wed, 23 Nov 2016 14:03:53 +0100 Subject: [PATCH] Fixes some integration-cli on userns Mainly adding requirements on Network or NotUserNamespace to make it pass. Signed-off-by: Vincent Demeester (cherry picked from commit eb5fe064cfb8475e9f6fb9beac98ad6ce63be2a3) Signed-off-by: Victor Vieux --- integration-cli/docker_cli_events_test.go | 2 +- integration-cli/docker_cli_plugins_test.go | 2 +- integration-cli/docker_cli_run_test.go | 2 +- integration-cli/docker_cli_run_unix_test.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/integration-cli/docker_cli_events_test.go b/integration-cli/docker_cli_events_test.go index 7191376f1a..f7048dd3da 100644 --- a/integration-cli/docker_cli_events_test.go +++ b/integration-cli/docker_cli_events_test.go @@ -276,7 +276,7 @@ func (s *DockerSuite) TestEventsImageLoad(c *check.C) { } func (s *DockerSuite) TestEventsPluginOps(c *check.C) { - testRequires(c, DaemonIsLinux) + testRequires(c, DaemonIsLinux, Network) since := daemonUnixTime(c) diff --git a/integration-cli/docker_cli_plugins_test.go b/integration-cli/docker_cli_plugins_test.go index b57ef8c53b..4166405a29 100644 --- a/integration-cli/docker_cli_plugins_test.go +++ b/integration-cli/docker_cli_plugins_test.go @@ -143,7 +143,7 @@ func (s *DockerSuite) TestPluginInstallArgs(c *check.C) { } func (s *DockerSuite) TestPluginInstallImage(c *check.C) { - testRequires(c, DaemonIsLinux) + testRequires(c, DaemonIsLinux, Network) out, _, err := dockerCmdWithError("plugin", "install", "redis") c.Assert(err, checker.NotNil) c.Assert(out, checker.Contains, "content is not a plugin") diff --git a/integration-cli/docker_cli_run_test.go b/integration-cli/docker_cli_run_test.go index 033d03a6b9..dd3f4cef32 100644 --- a/integration-cli/docker_cli_run_test.go +++ b/integration-cli/docker_cli_run_test.go @@ -4570,7 +4570,7 @@ func (s *DockerSuite) TestRunServicingContainer(c *check.C) { } func (s *DockerSuite) TestRunDuplicateMount(c *check.C) { - testRequires(c, SameHostDaemon, DaemonIsLinux) + testRequires(c, SameHostDaemon, DaemonIsLinux, NotUserNamespace) tmpFile, err := ioutil.TempFile("", "touch-me") c.Assert(err, checker.IsNil) diff --git a/integration-cli/docker_cli_run_unix_test.go b/integration-cli/docker_cli_run_unix_test.go index 4c2f829e3c..e346c19f8e 100644 --- a/integration-cli/docker_cli_run_unix_test.go +++ b/integration-cli/docker_cli_run_unix_test.go @@ -1312,7 +1312,7 @@ func (s *DockerSuite) TestUserNoEffectiveCapabilitiesChroot(c *check.C) { } func (s *DockerSuite) TestUserNoEffectiveCapabilitiesMknod(c *check.C) { - testRequires(c, DaemonIsLinux) + testRequires(c, DaemonIsLinux, NotUserNamespace) ensureSyscallTest(c) // test that a root user has default capability CAP_MKNOD