Skip to content

Commit

Permalink
Merge pull request #6293 from cbuesser/go-test-fix
Browse files Browse the repository at this point in the history
Go test fix
  • Loading branch information
Stebalien authored May 3, 2019
2 parents 5fd5d44 + 5ce2deb commit 7e9eb72
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion fuse/ipns/ipns_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ func setupIpnsTest(t *testing.T, node *core.IpfsNode) (*core.IpfsNode, *mountWra

var err error
if node == nil {
node, err = core.NewNode(context.Background(), nil)
node, err = core.NewNode(context.Background(), &core.BuildCfg{})
if err != nil {
t.Fatal(err)
}
Expand Down
9 changes: 6 additions & 3 deletions fuse/node/mount_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func TestExternalUnmount(t *testing.T) {
// TODO: needed?
maybeSkipFuseTests(t)

node, err := core.NewNode(context.Background(), nil)
node, err := core.NewNode(context.Background(), &core.BuildCfg{})
if err != nil {
t.Fatal(err)
}
Expand All @@ -64,9 +64,12 @@ func TestExternalUnmount(t *testing.T) {
mkdir(t, ipnsDir)

err = Mount(node, ipfsDir, ipnsDir)
if strings.Contains(err.Error(), "unable to check fuse version") || err == fuse.ErrOSXFUSENotFound {
t.Skip(err)
if err != nil {
if strings.Contains(err.Error(), "unable to check fuse version") || err == fuse.ErrOSXFUSENotFound {
t.Skip(err)
}
}

if err != nil {
t.Fatalf("error mounting: %v", err)
}
Expand Down

0 comments on commit 7e9eb72

Please sign in to comment.