X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=client-nowasm_test.go;h=9b93139da51142e200bc081f7b82c8941bdd04e2;hb=HEAD;hp=62c5a1dbbf83b8210d4bd4fcac724c0cdeabe677;hpb=c3c982b62183aa25e402a58aed2b76a12f5fa1aa;p=btrtrc.git

diff --git a/client-nowasm_test.go b/client-nowasm_test.go
index 62c5a1db..9b93139d 100644
--- a/client-nowasm_test.go
+++ b/client-nowasm_test.go
@@ -7,10 +7,11 @@ import (
 	"os"
 	"testing"
 
+	qt "github.com/frankban/quicktest"
+	"github.com/stretchr/testify/require"
+
 	"github.com/anacrolix/torrent/internal/testutil"
 	"github.com/anacrolix/torrent/storage"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 )
 
 func TestBoltPieceCompletionClosedWhenClientClosed(t *testing.T) {
@@ -31,25 +32,40 @@ func TestBoltPieceCompletionClosedWhenClientClosed(t *testing.T) {
 
 func TestIssue335(t *testing.T) {
 	dir, mi := testutil.GreetingTestTorrent()
-	defer os.RemoveAll(dir)
+	defer func() {
+		err := os.RemoveAll(dir)
+		if err != nil {
+			t.Fatalf("removing torrent dummy data dir: %v", err)
+		}
+	}()
+	logErr := func(f func() error, msg string) {
+		err := f()
+		t.Logf("%s: %v", msg, err)
+		if err != nil {
+			t.Fail()
+		}
+	}
 	cfg := TestingConfig(t)
 	cfg.Seed = false
 	cfg.Debug = true
 	cfg.DataDir = dir
 	comp, err := storage.NewBoltPieceCompletion(dir)
-	require.NoError(t, err)
-	defer comp.Close()
-	cfg.DefaultStorage = storage.NewMMapWithCompletion(dir, comp)
+	c := qt.New(t)
+	c.Assert(err, qt.IsNil)
+	defer logErr(comp.Close, "closing bolt piece completion")
+	mmapStorage := storage.NewMMapWithCompletion(dir, comp)
+	defer logErr(mmapStorage.Close, "closing mmap storage")
+	cfg.DefaultStorage = mmapStorage
 	cl, err := NewClient(cfg)
-	require.NoError(t, err)
+	c.Assert(err, qt.IsNil)
 	defer cl.Close()
 	tor, new, err := cl.AddTorrentSpec(TorrentSpecFromMetaInfo(mi))
-	require.NoError(t, err)
-	assert.True(t, new)
-	require.True(t, cl.WaitAll())
+	c.Assert(err, qt.IsNil)
+	c.Assert(new, qt.IsTrue)
+	c.Assert(cl.WaitAll(), qt.IsTrue)
 	tor.Drop()
 	_, new, err = cl.AddTorrentSpec(TorrentSpecFromMetaInfo(mi))
-	require.NoError(t, err)
-	assert.True(t, new)
-	require.True(t, cl.WaitAll())
+	c.Assert(err, qt.IsNil)
+	c.Assert(new, qt.IsTrue)
+	c.Assert(cl.WaitAll(), qt.IsTrue)
 }