From: Matt Joiner <anacrolix@gmail.com>
Date: Wed, 16 Dec 2015 04:06:23 +0000 (+1100)
Subject: Use testify for some tests
X-Git-Tag: v1.0.0~966
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=86b0c02eace8205160e2b12c1b5bee8fcdda3596;p=btrtrc.git

Use testify for some tests
---

diff --git a/dht/dht_test.go b/dht/dht_test.go
index 53457c1a..7dd5ef58 100644
--- a/dht/dht_test.go
+++ b/dht/dht_test.go
@@ -22,21 +22,15 @@ func TestMarshalCompactNodeInfo(t *testing.T) {
 		ID: [20]byte{'a', 'b', 'c'},
 	}
 	addr, err := net.ResolveUDPAddr("udp4", "1.2.3.4:5")
-	if err != nil {
-		t.Fatal(err)
-	}
+	require.NoError(t, err)
 	cni.Addr = newDHTAddr(addr)
 	var b [CompactIPv4NodeInfoLen]byte
-	cni.PutCompact(b[:])
-	if err != nil {
-		t.Fatal(err)
-	}
+	err = cni.PutCompact(b[:])
+	require.NoError(t, err)
 	var bb [26]byte
 	copy(bb[:], []byte("abc"))
 	copy(bb[20:], []byte("\x01\x02\x03\x04\x00\x05"))
-	if b != bb {
-		t.FailNow()
-	}
+	assert.EqualValues(t, bb, b)
 }
 
 func recoverPanicOrDie(t *testing.T, f func()) {
@@ -108,9 +102,7 @@ func TestClosestNodes(t *testing.T) {
 
 func TestDHTDefaultConfig(t *testing.T) {
 	s, err := NewServer(nil)
-	if err != nil {
-		t.Fatal(err)
-	}
+	assert.NoError(t, err)
 	s.Close()
 }