From 8f4d0f357770e47985ccfeb0ca4a12766900410d Mon Sep 17 00:00:00 2001 From: Matt Joiner Date: Mon, 27 Apr 2015 14:06:00 +1000 Subject: [PATCH] fs: Improve test error handling if FUSE isn't available --- fs/torrentfs_test.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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 -- 2.48.1