From c7136958710e0a4ba0e18bce94624b573400be5c Mon Sep 17 00:00:00 2001 From: Aaron Jacobs Date: Tue, 17 Mar 2015 15:27:40 +1100 Subject: [PATCH] Fixed broken tests using Mount. --- samples/cachingfs/caching_fs_test.go | 2 +- samples/hellofs/hello_fs_test.go | 2 +- samples/memfs/memfs_test.go | 9 +++------ 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/samples/cachingfs/caching_fs_test.go b/samples/cachingfs/caching_fs_test.go index 20e13df..d570a08 100644 --- a/samples/cachingfs/caching_fs_test.go +++ b/samples/cachingfs/caching_fs_test.go @@ -60,7 +60,7 @@ func (t *cachingFSTest) setUp( AssertEq(nil, err) // 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) err = t.mfs.WaitForReady(context.Background()) diff --git a/samples/hellofs/hello_fs_test.go b/samples/hellofs/hello_fs_test.go index a871916..fe1df85 100644 --- a/samples/hellofs/hello_fs_test.go +++ b/samples/hellofs/hello_fs_test.go @@ -65,7 +65,7 @@ func (t *HelloFSTest) SetUp(ti *TestInfo) { 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()) } diff --git a/samples/memfs/memfs_test.go b/samples/memfs/memfs_test.go index 6351234..200b7ec 100644 --- a/samples/memfs/memfs_test.go +++ b/samples/memfs/memfs_test.go @@ -27,7 +27,6 @@ import ( "testing" "time" - "github.com/jacobsa/bazilfuse" "github.com/jacobsa/fuse" "github.com/jacobsa/fuse/fusetesting" "github.com/jacobsa/fuse/samples/memfs" @@ -114,11 +113,9 @@ func (t *MemFSTest) SetUp(ti *TestInfo) { // Mount a file system. fs := memfs.NewMemFS(currentUid(), currentGid(), &t.clock) - t.mfs, err = fuse.Mount( - mountPoint, - fs, - bazilfuse.DefaultPermissions()) - + // TODO(jacobsa): Add a default_permissions field to the config and use it + // here. + t.mfs, err = fuse.Mount(mountPoint, fs, &fuse.MountConfig{}) if err != nil { panic("Mount: " + err.Error()) }