Fixes for storage tests on Windows

[btrtrc.git] / client-nowasm_test.go

diff --git a/client-nowasm_test.go b/client-nowasm_test.go
index 41645b6ee8acf42be58a2214b2fb8eefa6be302e..3ce43f2ab27c268aa9f4a1fc3a65c767e3588e51 100644 (file)
--- a/client-nowasm_test.go
+++ b/client-nowasm_test.go
@@ -7,7 +7,8 @@ import (
        "os"
        "testing"
 
-       "github.com/stretchr/testify/assert"
+       qt "github.com/frankban/quicktest"
+
        "github.com/stretchr/testify/require"
 
        "github.com/anacrolix/torrent/internal/testutil"
@@ -38,24 +39,34 @@ func TestIssue335(t *testing.T) {
                        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)
-       defer cl.Close()
+       c.Assert(err, qt.IsNil)
+       defer logErr(cl.Close, "closing client")
        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)
 }