From: Matt Joiner <anacrolix@gmail.com>
Date: Mon, 27 Apr 2015 04:06:00 +0000 (+1000)
Subject: fs: Improve test error handling if FUSE isn't available
X-Git-Tag: v1.0.0~1200
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=8f4d0f357770e47985ccfeb0ca4a12766900410d;p=btrtrc.git

fs: Improve test error handling if FUSE isn't available
---

diff --git a/fs/torrentfs_test.go b/fs/torrentfs_test.go
index ad8ac375..0ac72afc 100644
--- a/fs/torrentfs_test.go
+++ b/fs/torrentfs_test.go
@@ -105,10 +105,11 @@ func TestUnmountWedged(t *testing.T) {
 	fs := New(client)
 	fuseConn, err := fuse.Mount(layout.MountDir)
 	if err != nil {
-		if strings.Contains(err.Error(), "fuse") {
-			t.Skip(err)
+		msg := fmt.Sprintf("error mounting: %s", err)
+		if strings.Contains(err.Error(), "fuse") || err.Error() == "exit status 71" {
+			t.Skip(msg)
 		}
-		t.Fatal(err)
+		t.Fatal(msg)
 	}
 	go func() {
 		server := fusefs.Server{
@@ -121,7 +122,7 @@ func TestUnmountWedged(t *testing.T) {
 	}()
 	<-fuseConn.Ready
 	if err := fuseConn.MountError; err != nil {
-		t.Fatal(err)
+		t.Fatalf("mount error: %s", err)
 	}
 	// Read the greeting file, though it will never be available. This should
 	// "wedge" FUSE, requiring the fs object to be forcibly destroyed. The