From: Matt Joiner <anacrolix@gmail.com>
Date: Thu, 1 Jun 2017 01:19:45 +0000 (+1000)
Subject: Tighten FUSE test skipping
X-Git-Tag: v1.0.0~467
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=714a72cdd4c808db48facae64d43d06f2bf98444;p=btrtrc.git

Tighten FUSE test skipping
---

diff --git a/fs/torrentfs_test.go b/fs/torrentfs_test.go
index 53fcc400..dcd50fb8 100644
--- a/fs/torrentfs_test.go
+++ b/fs/torrentfs_test.go
@@ -8,7 +8,6 @@ import (
 	_ "net/http/pprof"
 	"os"
 	"path/filepath"
-	"strings"
 	"testing"
 	"time"
 
@@ -102,11 +101,11 @@ func TestUnmountWedged(t *testing.T) {
 	fs := New(client)
 	fuseConn, err := fuse.Mount(layout.MountDir)
 	if err != nil {
-		msg := fmt.Sprintf("error mounting: %s", err)
-		if strings.Contains(err.Error(), "fuse") || err.Error() == "exit status 71" {
-			t.Skip(msg)
+		switch err.Error() {
+		case "cannot locate OSXFUSE":
+			t.Skip(err)
 		}
-		t.Fatal(msg)
+		t.Fatal(err)
 	}
 	go func() {
 		server := fusefs.New(fuseConn, &fusefs.Config{