From d84226cc31d7ef1bc517a42b8aeb3350dcb0e74b Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Wed, 22 Oct 2014 16:52:35 +0100
Subject: [PATCH] Factor out testing error checks

---
 server/http_test.go        | 24 ++++++------------------
 server/mdns_client_test.go | 12 +++---------
 server/mdns_server_test.go | 12 +++---------
 server/testing_utils.go    | 11 +++++++++++
 server/zone_test.go        |  6 ------
 5 files changed, 23 insertions(+), 42 deletions(-)
 create mode 100644 server/testing_utils.go

diff --git a/server/http_test.go b/server/http_test.go
index 9f08bdc1..879b2a36 100644
--- a/server/http_test.go
+++ b/server/http_test.go
@@ -38,18 +38,14 @@ func TestHttp(t *testing.T) {
 	addr_url := fmt.Sprintf("http://localhost:%d/name/%s/%s", port, container_id, addr_parts[0])
 	resp, err := genForm("PUT", addr_url,
 		url.Values{"fqdn": {success_test_name}, "local_ip": {docker_ip}, "routing_prefix": {addr_parts[1]}})
-	if err != nil {
-		t.Fatal(err)
-	}
+	assertNoErr(t, err)
 	if resp.StatusCode != http.StatusOK {
 		t.Fatal("Unexpected http response", resp.Status)
 	}
 
 	// Check that the address is now there.
 	ip, err := zone.MatchLocal(success_test_name)
-	if err != nil {
-		t.Fatal(err)
-	}
+	assertNoErr(t, err)
 	weave_ip, _, _ := net.ParseCIDR(test_addr1)
 	if !ip.Equal(weave_ip) {
 		t.Fatal("Unexpected result for", success_test_name, ip)
@@ -58,9 +54,7 @@ func TestHttp(t *testing.T) {
 	// Adding exactly the same address should be OK
 	resp, err = genForm("PUT", addr_url,
 		url.Values{"fqdn": {success_test_name}, "local_ip": {docker_ip}, "routing_prefix": {addr_parts[1]}})
-	if err != nil {
-		t.Fatal(err)
-	}
+	assertNoErr(t, err)
 	if resp.StatusCode != http.StatusOK {
 		t.Fatal("Expected duplicate add to succeed with 200 OK")
 	}
@@ -69,18 +63,14 @@ func TestHttp(t *testing.T) {
 	other_url := fmt.Sprintf("http://localhost:%d/name/%s/%s", port, "other", addr_parts[0])
 	resp, err = genForm("PUT", other_url,
 		url.Values{"fqdn": {success_test_name}, "local_ip": {docker_ip}, "routing_prefix": {addr_parts[1]}})
-	if err != nil {
-		t.Fatal(err)
-	}
+	assertNoErr(t, err)
 	if resp.StatusCode != http.StatusConflict {
 		t.Fatal("Unexpected http response", resp.Status)
 	}
 
 	// Delete the address
 	resp, err = genForm("DELETE", addr_url, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
+	assertNoErr(t, err)
 	if resp.StatusCode != http.StatusOK {
 		t.Fatal("Unexpected http response", resp.Status)
 	}
@@ -93,9 +83,7 @@ func TestHttp(t *testing.T) {
 
 	// Delete the address again, it should accept this
 	resp, err = genForm("DELETE", addr_url, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
+	assertNoErr(t, err)
 	if resp.StatusCode != http.StatusOK {
 		t.Fatal("Unexpected http response", resp.Status)
 	}
diff --git a/server/mdns_client_test.go b/server/mdns_client_test.go
index 8d5795f0..6145b765 100644
--- a/server/mdns_client_test.go
+++ b/server/mdns_client_test.go
@@ -66,13 +66,9 @@ func RunLocalMulticastServer() (*dns.Server, error) {
 
 func setup(t *testing.T) (*MDNSClient, *dns.Server, error) {
 	mdnsClient, err := NewMDNSClient()
-	if err != nil {
-		t.Fatal(err)
-	}
+	assertNoErr(t, err)
 	err = mdnsClient.Start(nil)
-	if err != nil {
-		t.Fatal(err)
-	}
+	assertNoErr(t, err)
 
 	server, err := RunLocalMulticastServer()
 	if err != nil {
@@ -96,9 +92,7 @@ func (c *testContext) checkResponse(t *testing.T, channel_ok bool, resp *Respons
 		c.channel = nil
 		return
 	}
-	if resp.Err != nil {
-		t.Fatal(resp.Err)
-	}
+	assertNoErr(t, resp.Err)
 	log.Printf("Got address response %s addr %s", resp.Name, resp.Addr)
 	c.received_addr = resp.Addr
 	c.received_count++
diff --git a/server/mdns_server_test.go b/server/mdns_server_test.go
index aafe821e..3560a460 100644
--- a/server/mdns_server_test.go
+++ b/server/mdns_server_test.go
@@ -37,22 +37,16 @@ func TestServerSimpleQuery(t *testing.T) {
 	zone.AddRecord(container_id, "test.weave.", docker_ip, weave_ip, subnet)
 
 	mdnsServer, err := NewMDNSServer(zone)
-	if err != nil {
-		t.Fatal(err)
-	}
+	assertNoErr(t, err)
 	err = mdnsServer.Start(nil)
-	if err != nil {
-		t.Fatal(err)
-	}
+	assertNoErr(t, err)
 
 	var received_addr net.IP
 	received_count := 0
 
 	// Implement a minimal listener for responses
 	multicast, err := LinkLocalMulticastListener(nil)
-	if err != nil {
-		t.Fatal(err)
-	}
+	assertNoErr(t, err)
 
 	handleMDNS := func(w dns.ResponseWriter, r *dns.Msg) {
 		// Only handle responses here
diff --git a/server/testing_utils.go b/server/testing_utils.go
new file mode 100644
index 00000000..9a30a59c
--- /dev/null
+++ b/server/testing_utils.go
@@ -0,0 +1,11 @@
+package weavedns
+
+import (
+	"testing"
+)
+
+func assertNoErr(t *testing.T, err error) {
+	if err != nil {
+		t.Fatal(err)
+	}
+}
diff --git a/server/zone_test.go b/server/zone_test.go
index fbd67e04..236b7518 100644
--- a/server/zone_test.go
+++ b/server/zone_test.go
@@ -5,12 +5,6 @@ import (
 	"testing"
 )
 
-func assertNoErr(t *testing.T, err error) {
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
 func TestZone(t *testing.T) {
 	var (
 		container_id      = "deadbeef"