From 9e96f283116f871937053d5a096eb6b91fed75a2 Mon Sep 17 00:00:00 2001
From: Michael Haro <mharo@google.com>
Date: Thu, 19 Feb 2015 00:08:28 -0800
Subject: [PATCH] Fix problems noted by 'go vet'

---
 dns_test.go    |  2 +-
 server_test.go | 10 +++++-----
 xfr_test.go    |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dns_test.go b/dns_test.go
index 63797fb0..d4894065 100644
--- a/dns_test.go
+++ b/dns_test.go
@@ -595,7 +595,7 @@ func TestMsgPackBuffer(t *testing.T) {
 		input, _ := hex.DecodeString(hexData)
 		m := new(Msg)
 		if e := m.Unpack(input); e != nil {
-			t.Logf("packet %d failed to unpack")
+			t.Logf("packet %d failed to unpack", i)
 			t.Fail()
 			continue
 		}
diff --git a/server_test.go b/server_test.go
index 5efb1cf8..bae8853f 100644
--- a/server_test.go
+++ b/server_test.go
@@ -105,7 +105,7 @@ func TestServing(t *testing.T) {
 	r, _, err := c.Exchange(m, addrstr)
 	if err != nil || len(r.Extra) == 0 {
 		t.Log("failed to exchange miek.nl", err)
-		t.Fatal()
+		t.FailNow()
 	}
 	txt := r.Extra[0].(*TXT).Txt[0]
 	if txt != "Hello world" {
@@ -117,7 +117,7 @@ func TestServing(t *testing.T) {
 	r, _, err = c.Exchange(m, addrstr)
 	if err != nil {
 		t.Log("failed to exchange example.com", err)
-		t.Fatal()
+		t.FailNow()
 	}
 	txt = r.Extra[0].(*TXT).Txt[0]
 	if txt != "Hello example" {
@@ -354,13 +354,13 @@ func TestServingResponse(t *testing.T) {
 	_, _, err = c.Exchange(m, addrstr)
 	if err != nil {
 		t.Log("failed to exchange", err)
-		t.Fatal()
+		t.FailNow()
 	}
 	m.Response = true
 	_, _, err = c.Exchange(m, addrstr)
 	if err == nil {
 		t.Log("exchanged response message")
-		t.Fatal()
+		t.FailNow()
 	}
 
 	s.Shutdown()
@@ -374,7 +374,7 @@ func TestServingResponse(t *testing.T) {
 	_, _, err = c.Exchange(m, addrstr)
 	if err != nil {
 		t.Log("could exchanged response message in Unsafe mode")
-		t.Fatal()
+		t.FailNow()
 	}
 }
 
diff --git a/xfr_test.go b/xfr_test.go
index 4e3d1b6c..6537a8d5 100644
--- a/xfr_test.go
+++ b/xfr_test.go
@@ -29,7 +29,7 @@ func testClientAXFR(t *testing.T) {
 
 	if a, err := tr.In(m, net.JoinHostPort(server, "53")); err != nil {
 		t.Log("failed to setup axfr: " + err.Error())
-		t.Fatal()
+		t.FailNow()
 	} else {
 		for ex := range a {
 			if ex.Error != nil {
@@ -83,7 +83,7 @@ func testClientTsigAXFR(t *testing.T) {
 
 	if a, err := tr.In(m, "176.58.119.54:53"); err != nil {
 		t.Log("failed to setup axfr: " + err.Error())
-		t.Fatal()
+		t.FailNow()
 	} else {
 		for ex := range a {
 			if ex.Error != nil {