diff options
author | Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp> | 2020-03-13 22:37:09 +0900 |
---|---|---|
committer | Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp> | 2020-03-16 17:37:38 +0900 |
commit | 5e1b246b9a292255f3b732757adabb020309b383 (patch) | |
tree | 4e6a79f7d8da7426f0a791c2ce908833d6c295b1 /integration/plugin | |
parent | f310bd29bd5ab52caa0536c85d564461a70abf16 (diff) | |
download | docker-5e1b246b9a292255f3b732757adabb020309b383.tar.gz |
test-integration: support more rootless tests
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
Diffstat (limited to 'integration/plugin')
-rw-r--r-- | integration/plugin/authz/main_test.go | 1 | ||||
-rw-r--r-- | integration/plugin/graphdriver/external_test.go | 1 | ||||
-rw-r--r-- | integration/plugin/volumes/mounts_test.go | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/integration/plugin/authz/main_test.go b/integration/plugin/authz/main_test.go index 7c1bf56c57..ec02c09fd9 100644 --- a/integration/plugin/authz/main_test.go +++ b/integration/plugin/authz/main_test.go @@ -49,6 +49,7 @@ func TestMain(m *testing.M) { func setupTest(t *testing.T) func() { skip.If(t, testEnv.IsRemoteDaemon, "cannot run daemon when remote daemon") skip.If(t, testEnv.DaemonInfo.OSType == "windows") + skip.If(t, testEnv.IsRootless, "rootless mode has different view of localhost") environment.ProtectAll(t, testEnv) d = daemon.New(t, daemon.WithExperimental()) diff --git a/integration/plugin/graphdriver/external_test.go b/integration/plugin/graphdriver/external_test.go index c9c99ff070..4c848aa075 100644 --- a/integration/plugin/graphdriver/external_test.go +++ b/integration/plugin/graphdriver/external_test.go @@ -48,6 +48,7 @@ func TestExternalGraphDriver(t *testing.T) { skip.If(t, runtime.GOOS == "windows") skip.If(t, testEnv.IsRemoteDaemon, "cannot run daemon when remote daemon") skip.If(t, !requirement.HasHubConnectivity(t)) + skip.If(t, testEnv.IsRootless, "rootless mode doesn't support external graph driver") // Setup plugin(s) ec := make(map[string]*graphEventsCounter) diff --git a/integration/plugin/volumes/mounts_test.go b/integration/plugin/volumes/mounts_test.go index 87ec9caeca..991b1e1105 100644 --- a/integration/plugin/volumes/mounts_test.go +++ b/integration/plugin/volumes/mounts_test.go @@ -18,6 +18,7 @@ import ( func TestPluginWithDevMounts(t *testing.T) { skip.If(t, testEnv.IsRemoteDaemon, "cannot run daemon when remote daemon") skip.If(t, testEnv.DaemonInfo.OSType == "windows") + skip.If(t, testEnv.IsRootless) t.Parallel() d := daemon.New(t) |