From e78223ecee4784f7a48b0e305398de11b2a3bb30 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Sat, 5 Jun 2021 23:14:29 +0200 Subject: [PATCH] Remove TestNonEmptyMountPoint; libfuse3 allows non-empty mountpoints See also: https://github.com/libfuse/libfuse/commit/0bef21e8543dda7f02b5f4cb3008a7292d249842 --- mount_test.go | 46 ---------------------------------------------- 1 file changed, 46 deletions(-) diff --git a/mount_test.go b/mount_test.go index ba5de7a..87cc36a 100644 --- a/mount_test.go +++ b/mount_test.go @@ -5,7 +5,6 @@ import ( "io/ioutil" "os" "path" - "runtime" "strings" "testing" @@ -65,51 +64,6 @@ func TestSuccessfulMount(t *testing.T) { defer fuse.Unmount(mfs.Dir()) } -func TestNonEmptyMountPoint(t *testing.T) { - ctx := context.Background() - - // osxfuse appears to be happy to mount over a non-empty mount point. - // - // We leave this test in for Linux, because it tickles the behavior of - // fusermount writing to stderr and exiting with an error code. We want to - // make sure that a descriptive error makes it back to the user. - if runtime.GOOS == "darwin" { - return - } - - // Set up a temporary directory. - dir, err := ioutil.TempDir("", "mount_test") - if err != nil { - t.Fatalf("ioutil.TempDir: %v", err) - } - - defer os.RemoveAll(dir) - - // Add a file within it. - err = ioutil.WriteFile(path.Join(dir, "foo"), []byte{}, 0600) - if err != nil { - t.Fatalf("ioutil.WriteFile: %v", err) - } - - // Attempt to mount. - fs := &minimalFS{} - mfs, err := fuse.Mount( - dir, - fuseutil.NewFileSystemServer(fs), - &fuse.MountConfig{}) - - if err == nil { - fuse.Unmount(mfs.Dir()) - mfs.Join(ctx) - t.Fatal("fuse.Mount returned nil") - } - - const want = "not empty" - if got := err.Error(); !strings.Contains(got, want) { - t.Errorf("Unexpected error: %v", got) - } -} - func TestNonexistentMountPoint(t *testing.T) { ctx := context.Background()