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

Merge pull request #36505 from kolyshkin/pkg-mount-tests

Browse Source 
pkg/mount unit tests: skip some test under non-root
Upstream-commit: 4a1d35c546c4a5df3353f5984d86671f702a315a
Component: engine
This commit is contained in:
Akihiro Suda
2018-03-08 17:27:31 +09:00
committed by GitHub
parent 1158d96fc9 db90a864e8
commit 7856345e7b
3 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/engine/pkg/mount/mount_unix_test.go
View File

@ -25,6 +25,10 @@ func TestMountOptionsParsing(t *testing.T) {
}
func TestMounted(t *testing.T) {
if os.Getuid() != 0 {
t.Skip("root required")
}
tmp := path.Join(os.TempDir(), "mount-tests")
if err := os.MkdirAll(tmp, 0777); err != nil {
t.Fatal(err)
@ -76,6 +80,10 @@ func TestMounted(t *testing.T) {
}
func TestMountReadonly(t *testing.T) {
if os.Getuid() != 0 {
t.Skip("root required")
}
tmp := path.Join(os.TempDir(), "mount-tests")
if err := os.MkdirAll(tmp, 0777); err != nil {
t.Fatal(err)

2
components/engine/pkg/mount/mounter_linux_test.go
View File

@ -14,7 +14,7 @@ import (
func TestMount(t *testing.T) {
if os.Getuid() != 0 {
t.Skip("not root tests would fail")
t.Skip("root required")
}
source, err := ioutil.TempDir("", "mount-test-source-")

16
components/engine/pkg/mount/sharedsubtree_linux_test.go
View File

@ -12,6 +12,10 @@ import (
// nothing is propagated in or out
func TestSubtreePrivate(t *testing.T) {
if os.Getuid() != 0 {
t.Skip("root required")
}
tmp := path.Join(os.TempDir(), "mount-tests")
if err := os.MkdirAll(tmp, 0777); err != nil {
t.Fatal(err)
@ -110,6 +114,10 @@ func TestSubtreePrivate(t *testing.T) {
// Testing that when a target is a shared mount,
// then child mounts propagate to the source
func TestSubtreeShared(t *testing.T) {
if os.Getuid() != 0 {
t.Skip("root required")
}
tmp := path.Join(os.TempDir(), "mount-tests")
if err := os.MkdirAll(tmp, 0777); err != nil {
t.Fatal(err)
@ -178,6 +186,10 @@ func TestSubtreeShared(t *testing.T) {
// testing that mounts to a shared source show up in the slave target,
// and that mounts into a slave target do _not_ show up in the shared source
func TestSubtreeSharedSlave(t *testing.T) {
if os.Getuid() != 0 {
t.Skip("root required")
}
tmp := path.Join(os.TempDir(), "mount-tests")
if err := os.MkdirAll(tmp, 0777); err != nil {
t.Fatal(err)
@ -282,6 +294,10 @@ func TestSubtreeSharedSlave(t *testing.T) {
}
func TestSubtreeUnbindable(t *testing.T) {
if os.Getuid() != 0 {
t.Skip("root required")
}
tmp := path.Join(os.TempDir(), "mount-tests")
if err := os.MkdirAll(tmp, 0777); err != nil {
t.Fatal(err)