Fix up common/testing confusions

nameserver/mdns_server_test.go

@@ -2,6 +2,7 @@ package nameserver
 
 import (
 	"github.com/miekg/dns"
+	"github.com/zettio/weave/common"
 	wt "github.com/zettio/weave/testing"
 	"log"
 	"net"
@@ -34,7 +35,7 @@ func sendQuery(name string, querytype uint16) error {
 
 func TestServerSimpleQuery(t *testing.T) {
 	// The ff can be handy for debugging (obvs)
-	wt.InitDefaultLogging(true)
+	common.InitDefaultLogging(true)
 
 	log.Println("TestServerSimpleQuery starting")
 	var zone = new(ZoneDb)

nameserver/server_test.go

@@ -3,7 +3,8 @@ package nameserver
 import (
 	"fmt"
 	"github.com/miekg/dns"
-	wt "github.com/zettio/weave/common"
+	"github.com/zettio/weave/common"
+	wt "github.com/zettio/weave/testing"
 	"net"
 	"testing"
 	"time"
@@ -22,7 +23,7 @@ func TestDNSServer(t *testing.T) {
 	dnsAddr := fmt.Sprintf("localhost:%d", port)
 	testCIDR1 := testAddr1 + "/24"
 
-	wt.InitDefaultLogging(true)
+	common.InitDefaultLogging(true)
 	var zone = new(ZoneDb)
 	ip, _, _ := net.ParseCIDR(testCIDR1)
 	zone.AddRecord(containerID, successTestName, ip)