Skip to content

Commit

Permalink
fix macos build when fuse is enabled
Browse files Browse the repository at this point in the history
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 <steven@stebalien.com>
  • Loading branch information
Stebalien committed Apr 19, 2019
1 parent 739f762 commit ad56e66
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 5 deletions.
2 changes: 0 additions & 2 deletions fuse/node/mount_nofuse.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
3 changes: 2 additions & 1 deletion fuse/node/mount_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ package node
import (
"io/ioutil"
"os"
"strings"
"testing"
"time"

Expand Down Expand Up @@ -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 {
Expand Down
2 changes: 0 additions & 2 deletions fuse/node/mount_unix.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit ad56e66

Please sign in to comment.