fs/torrentfs_test.go | 13 +++++-------- diff --git a/fs/torrentfs_test.go b/fs/torrentfs_test.go index ab3ab4bc61e66b3a8db909935b6e09789092601b..45e0cee7c2318b48423824f66f3ee9cd56ac8f46 100644 --- a/fs/torrentfs_test.go +++ b/fs/torrentfs_test.go @@ -103,8 +103,9 @@ fs := New(client) fuseConn, err := fuse.Mount(layout.MountDir) if err != nil { switch err.Error() { - case "cannot locate OSXFUSE", - "fusermount: exit status 1": + case "cannot locate OSXFUSE": + fallthrough + case "fusermount: exit status 1": t.Skip(err) } t.Fatal(err) @@ -134,9 +135,7 @@ }() go func() { defer cancel() _, err := ioutil.ReadFile(filepath.Join(layout.MountDir, tt.Info().Name)) - if err == nil { - t.Fatal("expected error reading greeting") - } + require.Error(t, err) }() // Wait until the read has blocked inside the filesystem code. @@ -159,9 +158,7 @@ } } err = fuseConn.Close() - if err != nil { - t.Fatalf("error closing fuse conn: %s", err) - } + assert.NoError(t, err) } func TestDownloadOnDemand(t *testing.T) {