From ad56e66bcb28ef12d7340c872344273261798ed8 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Thu, 18 Apr 2019 18:10:29 -0700 Subject: [PATCH] fix macos build when fuse is enabled Instead of trying to export the `errNeedFuseVersion` type, just use string matching. It's good enough for testing and the alternative was annoying. License: MIT Signed-off-by: Steven Allen --- fuse/node/mount_nofuse.go | 2 -- fuse/node/mount_test.go | 3 ++- fuse/node/mount_unix.go | 2 -- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/fuse/node/mount_nofuse.go b/fuse/node/mount_nofuse.go index 92f61f809eb9..7f824ef3e12d 100644 --- a/fuse/node/mount_nofuse.go +++ b/fuse/node/mount_nofuse.go @@ -8,8 +8,6 @@ import ( core "github.com/ipfs/go-ipfs/core" ) -type errNeedFuseVersion error // used in tests, needed in OSX - func Mount(node *core.IpfsNode, fsdir, nsdir string) error { return errors.New("not compiled in") } diff --git a/fuse/node/mount_test.go b/fuse/node/mount_test.go index 69d07c9684d2..80f621c4413c 100644 --- a/fuse/node/mount_test.go +++ b/fuse/node/mount_test.go @@ -5,6 +5,7 @@ package node import ( "io/ioutil" "os" + "strings" "testing" "time" @@ -63,7 +64,7 @@ func TestExternalUnmount(t *testing.T) { mkdir(t, ipnsDir) err = Mount(node, ipfsDir, ipnsDir) - if _, ok := err.(errNeedFuseVersion); ok || err == fuse.ErrOSXFUSENotFound { + if strings.Contains("unable to check fuse version") || err == fuse.ErrOSXFUSENotFound { t.Skip(err) } if err != nil { diff --git a/fuse/node/mount_unix.go b/fuse/node/mount_unix.go index 3b9cb5c3a079..8fee86947497 100644 --- a/fuse/node/mount_unix.go +++ b/fuse/node/mount_unix.go @@ -30,8 +30,6 @@ var platformFuseChecks = func(*core.IpfsNode) error { return nil } -type errNeedFuseVersion error // used in tests, needed in OSX - func Mount(node *core.IpfsNode, fsdir, nsdir string) error { // check if we already have live mounts. // if the user said "Mount", then there must be something wrong.