Fixes for storage tests on Windows

[btrtrc.git] / storage / issue95_test.go

diff --git a/storage/issue95_test.go b/storage/issue95_test.go
index d47410dae3c287c56c9b2d6bb66a4f309f75cc3a..92370797b6698248458d934aea6a6e498ceb04d6 100644 (file)
--- a/storage/issue95_test.go
+++ b/storage/issue95_test.go
@@ -1,11 +1,9 @@
 package storage
 
 import (
-       "io/ioutil"
-       "os"
        "testing"
 
-       "github.com/anacrolix/missinggo/resource"
+       "github.com/anacrolix/missinggo/v2/resource"
        "github.com/stretchr/testify/assert"
        "github.com/stretchr/testify/require"
 
@@ -21,34 +19,33 @@ func testIssue95(t *testing.T, c ClientImpl) {
        }
        t1, err := c.OpenTorrent(i1, metainfo.HashBytes([]byte("a")))
        require.NoError(t, err)
+       defer t1.Close()
        i2 := &metainfo.Info{
                Files:  []metainfo.FileInfo{{Path: []string{"a"}}},
                Pieces: make([]byte, 20),
        }
        t2, err := c.OpenTorrent(i2, metainfo.HashBytes([]byte("b")))
        require.NoError(t, err)
+       defer t2.Close()
        t2p := t2.Piece(i2.Piece(0))
        assert.NoError(t, t1.Close())
        assert.NotPanics(t, func() { t2p.Completion() })
 }
 
 func TestIssue95File(t *testing.T) {
-       td, err := ioutil.TempDir("", "")
-       require.NoError(t, err)
-       defer os.RemoveAll(td)
-       testIssue95(t, NewFile(td))
+       td := t.TempDir()
+       cs := NewFile(td)
+       defer cs.Close()
+       testIssue95(t, cs)
 }
 
 func TestIssue95MMap(t *testing.T) {
-       td, err := ioutil.TempDir("", "")
-       require.NoError(t, err)
-       defer os.RemoveAll(td)
-       testIssue95(t, NewMMap(td))
+       td := t.TempDir()
+       cs := NewMMap(td)
+       defer cs.Close()
+       testIssue95(t, cs)
 }
 
 func TestIssue95ResourcePieces(t *testing.T) {
-       td, err := ioutil.TempDir("", "")
-       require.NoError(t, err)
-       defer os.RemoveAll(td)
        testIssue95(t, NewResourcePieces(resource.OSFileProvider{}))
 }