Handle torrentfs failure in test.sh

[btrtrc.git] / bencode / both_test.go

diff --git a/bencode/both_test.go b/bencode/both_test.go
index d837b6193230271ca5f885919b29ad52cfd9320a..fdcb90d9f8e44184039c3c6aa825b79d1a6f6667 100644 (file)
--- a/bencode/both_test.go
+++ b/bencode/both_test.go
@@ -1,35 +1,31 @@
 package bencode
 
-import "testing"
-import "bytes"
-import "io/ioutil"
+import (
+       "bytes"
+       "os"
+       "testing"
+
+       "github.com/stretchr/testify/assert"
+       "github.com/stretchr/testify/require"
+)
 
 func loadFile(name string, t *testing.T) []byte {
-       data, err := ioutil.ReadFile(name)
-       if err != nil {
-               t.Fatal(err)
-       }
+       data, err := os.ReadFile(name)
+       require.NoError(t, err)
        return data
 }
 
 func testFileInterface(t *testing.T, filename string) {
        data1 := loadFile(filename, t)
-       var iface interface{}
 
+       var iface interface{}
        err := Unmarshal(data1, &iface)
-       if err != nil {
-               t.Fatal(err)
-       }
+       require.NoError(t, err)
 
        data2, err := Marshal(iface)
-       if err != nil {
-               t.Fatal(err)
-       }
-
-       if !bytes.Equal(data1, data2) {
-               t.Fatalf("equality expected\n")
-       }
+       require.NoError(t, err)
 
+       assert.EqualValues(t, data1, data2)
 }
 
 func TestBothInterface(t *testing.T) {