Fixed broken tests using Mount.
parent
8adb300b78
commit
c713695871
|
@ -60,7 +60,7 @@ func (t *cachingFSTest) setUp(
|
||||||
AssertEq(nil, err)
|
AssertEq(nil, err)
|
||||||
|
|
||||||
// Mount it.
|
// Mount it.
|
||||||
t.mfs, err = fuse.Mount(t.dir, t.fs)
|
t.mfs, err = fuse.Mount(t.dir, t.fs, &fuse.MountConfig{})
|
||||||
AssertEq(nil, err)
|
AssertEq(nil, err)
|
||||||
|
|
||||||
err = t.mfs.WaitForReady(context.Background())
|
err = t.mfs.WaitForReady(context.Background())
|
||||||
|
|
|
@ -65,7 +65,7 @@ func (t *HelloFSTest) SetUp(ti *TestInfo) {
|
||||||
Clock: &t.clock,
|
Clock: &t.clock,
|
||||||
}
|
}
|
||||||
|
|
||||||
if t.mfs, err = fuse.Mount(mountPoint, fs); err != nil {
|
if t.mfs, err = fuse.Mount(mountPoint, fs, &fuse.MountConfig{}); err != nil {
|
||||||
panic("Mount: " + err.Error())
|
panic("Mount: " + err.Error())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -27,7 +27,6 @@ import (
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/jacobsa/bazilfuse"
|
|
||||||
"github.com/jacobsa/fuse"
|
"github.com/jacobsa/fuse"
|
||||||
"github.com/jacobsa/fuse/fusetesting"
|
"github.com/jacobsa/fuse/fusetesting"
|
||||||
"github.com/jacobsa/fuse/samples/memfs"
|
"github.com/jacobsa/fuse/samples/memfs"
|
||||||
|
@ -114,11 +113,9 @@ func (t *MemFSTest) SetUp(ti *TestInfo) {
|
||||||
// Mount a file system.
|
// Mount a file system.
|
||||||
fs := memfs.NewMemFS(currentUid(), currentGid(), &t.clock)
|
fs := memfs.NewMemFS(currentUid(), currentGid(), &t.clock)
|
||||||
|
|
||||||
t.mfs, err = fuse.Mount(
|
// TODO(jacobsa): Add a default_permissions field to the config and use it
|
||||||
mountPoint,
|
// here.
|
||||||
fs,
|
t.mfs, err = fuse.Mount(mountPoint, fs, &fuse.MountConfig{})
|
||||||
bazilfuse.DefaultPermissions())
|
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic("Mount: " + err.Error())
|
panic("Mount: " + err.Error())
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue