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