From 6d8310d2df07edcd8036e9f941e17d5c597c6319 Mon Sep 17 00:00:00 2001
From: Matt Joiner <anacrolix@gmail.com>
Date: Wed, 16 Dec 2015 15:16:53 +1100
Subject: [PATCH] Test improvements

---
 dht/dht_test.go | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/dht/dht_test.go b/dht/dht_test.go
index 08a9697a..082b15b3 100644
--- a/dht/dht_test.go
+++ b/dht/dht_test.go
@@ -174,10 +174,10 @@ func TestDHTSec(t *testing.T) {
 }
 
 func TestServerDefaultNodeIdSecure(t *testing.T) {
-	s, err := NewServer(nil)
-	if err != nil {
-		t.Fatal(err)
-	}
+	s, err := NewServer(&ServerConfig{
+		NoDefaultBootstrap: true,
+	})
+	require.NoError(t, err)
 	defer s.Close()
 	if !NodeIdSecure(s.ID(), missinggo.AddrIP(s.Addr())) {
 		t.Fatal("not secure")
@@ -201,6 +201,9 @@ func TestServerCustomNodeId(t *testing.T) {
 }
 
 func TestAnnounceTimeout(t *testing.T) {
+	if testing.Short() {
+		t.Skip()
+	}
 	s, err := NewServer(&ServerConfig{
 		BootstrapNodes: []string{"1.2.3.4:5"},
 	})