]> Sergey Matveev's repositories - btrtrc.git/commitdiff
fs: Improve test error handling if FUSE isn't available
authorMatt Joiner <anacrolix@gmail.com>
Mon, 27 Apr 2015 04:06:00 +0000 (14:06 +1000)
committerMatt Joiner <anacrolix@gmail.com>
Mon, 27 Apr 2015 04:06:00 +0000 (14:06 +1000)
fs/torrentfs_test.go

index ad8ac3757dd5287da061b515d9bcaf8dfcd6437e..0ac72afc1733e6fbceedab1c322d95afceaeccaf 100644 (file)
@@ -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