1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

volume/local/TestCreateWithOpts(): use mount filter

This is not for the sake of test to run faster of course;
this is to simplify the code as well as have some more
testing for mount.SingleEntryFilter().

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This commit is contained in:
Kir Kolyshkin 2018-03-08 15:27:09 -08:00
parent ac39a95ea6
commit ce468f0ad0

View file

@ -184,6 +184,10 @@ func TestCreateWithOpts(t *testing.T) {
if runtime.GOOS == "windows" { if runtime.GOOS == "windows" {
t.Skip() t.Skip()
} }
if os.Getuid() != 0 {
t.Skip("root required")
}
rootDir, err := ioutil.TempDir("", "local-volume-test") rootDir, err := ioutil.TempDir("", "local-volume-test")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@ -215,33 +219,27 @@ func TestCreateWithOpts(t *testing.T) {
} }
}() }()
mountInfos, err := mount.GetMounts(nil) mountInfos, err := mount.GetMounts(mount.SingleEntryFilter(dir))
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
if len(mountInfos) != 1 {
var found bool t.Fatalf("expected 1 mount, found %d: %+v", len(mountInfos), mountInfos)
for _, info := range mountInfos {
if info.Mountpoint == dir {
found = true
if info.Fstype != "tmpfs" {
t.Fatalf("expected tmpfs mount, got %q", info.Fstype)
}
if info.Source != "tmpfs" {
t.Fatalf("expected tmpfs mount, got %q", info.Source)
}
if !strings.Contains(info.VfsOpts, "uid=1000") {
t.Fatalf("expected mount info to have uid=1000: %q", info.VfsOpts)
}
if !strings.Contains(info.VfsOpts, "size=1024k") {
t.Fatalf("expected mount info to have size=1024k: %q", info.VfsOpts)
}
break
}
} }
if !found { info := mountInfos[0]
t.Fatal("mount not found") t.Logf("%+v", info)
if info.Fstype != "tmpfs" {
t.Fatalf("expected tmpfs mount, got %q", info.Fstype)
}
if info.Source != "tmpfs" {
t.Fatalf("expected tmpfs mount, got %q", info.Source)
}
if !strings.Contains(info.VfsOpts, "uid=1000") {
t.Fatalf("expected mount info to have uid=1000: %q", info.VfsOpts)
}
if !strings.Contains(info.VfsOpts, "size=1024k") {
t.Fatalf("expected mount info to have size=1024k: %q", info.VfsOpts)
} }
if v.active.count != 1 { if v.active.count != 1 {