From: Matt Joiner <anacrolix@gmail.com>
Date: Wed, 3 Dec 2014 18:51:49 +0000 (-0600)
Subject: tracker/udp: Tidy up tests
X-Git-Tag: v1.0.0~1424
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=ba1367536c2c54bb4889c1bfd562cbf11f0ace21;p=btrtrc.git

tracker/udp: Tidy up tests
---

diff --git a/tracker/udp/udp_tracker_test.go b/tracker/udp/udp_tracker_test.go
index 118d2489..44ba25fe 100644
--- a/tracker/udp/udp_tracker_test.go
+++ b/tracker/udp/udp_tracker_test.go
@@ -68,13 +68,8 @@ func TestLongWriteUDP(t *testing.T) {
 func TestShortBinaryRead(t *testing.T) {
 	var data ResponseHeader
 	err := binary.Read(bytes.NewBufferString("\x00\x00\x00\x01"), binary.BigEndian, &data)
-	if data.Action != 0 {
-		t.Log("optimistic binary read now works?!")
-	}
-	switch err {
-	case io.ErrUnexpectedEOF:
-	default:
-		// TODO
+	if err != io.ErrUnexpectedEOF {
+		t.FailNow()
 	}
 }
 
@@ -113,6 +108,11 @@ func TestAnnounceRandomInfoHash(t *testing.T) {
 	if testing.Short() {
 		t.SkipNow()
 	}
+	req := tracker.AnnounceRequest{
+		Event: tracker.Stopped,
+	}
+	rand.Read(req.PeerId[:])
+	rand.Read(req.InfoHash[:])
 	wg := sync.WaitGroup{}
 	for _, url := range []string{
 		"udp://tracker.openbittorrent.com:80/announce",
@@ -131,11 +131,6 @@ func TestAnnounceRandomInfoHash(t *testing.T) {
 				t.Log(err)
 				return
 			}
-			req := tracker.AnnounceRequest{
-				Event: tracker.Stopped,
-			}
-			rand.Read(req.PeerId[:])
-			rand.Read(req.InfoHash[:])
 			resp, err := tr.Announce(&req)
 			if err != nil {
 				t.Logf("error announcing to %s: %s", url, err)