Gets rid of testing mocks.

logging_test.go

@@ -1,35 +1,24 @@
 package memberlist
 
 import (
+	"fmt"
 	"net"
 	"testing"
-	"time"
 )
 
-type mockAddr struct{ addr string }
-
-func (m *mockAddr) Network() string { return "don't care" }
-func (m *mockAddr) String() string  { return m.addr }
-
-type mockConn struct{ addr *mockAddr }
-
-func (m *mockConn) Read(b []byte) (n int, err error)   { return 0, nil }
-func (m *mockConn) Write(b []byte) (n int, err error)  { return 0, nil }
-func (m *mockConn) Close() error                       { return nil }
-func (m *mockConn) LocalAddr() net.Addr                { return nil }
-func (m *mockConn) RemoteAddr() net.Addr               { return m.addr }
-func (m *mockConn) SetDeadline(t time.Time) error      { return nil }
-func (m *mockConn) SetReadDeadline(t time.Time) error  { return nil }
-func (m *mockConn) SetWriteDeadline(t time.Time) error { return nil }
-
 func TestLogging_Address(t *testing.T) {
 	s := LogAddress(nil)
 	if s != "from=<unknown address>" {
 		t.Fatalf("bad: %s", s)
 	}
 
-	s = LogAddress(&mockAddr{"hello"})
-	if s != "from=hello" {
+	addr, err := net.ResolveIPAddr("ip4", "127.0.0.1")
+	if err != nil {
+		t.Fatalf("err: %v", err)
+	}
+
+	s = LogAddress(addr)
+	if s != "from=127.0.0.1" {
 		t.Fatalf("bad: %s", s)
 	}
 }
@@ -40,8 +29,19 @@ func TestLogging_Conn(t *testing.T) {
 		t.Fatalf("bad: %s", s)
 	}
 
-	s = LogConn(&mockConn{&mockAddr{"hello"}})
-	if s != "from=hello" {
+	ln, err := net.Listen("tcp", ":0")
+	if err != nil {
+		t.Fatalf("err: %v", err)
+	}
+
+	conn, err := net.Dial("tcp", ln.Addr().String())
+	if err != nil {
+		t.Fatalf("err: %v", err)
+	}
+	defer conn.Close()
+
+	s = LogConn(conn)
+	if s != fmt.Sprintf("from=%s", conn.RemoteAddr().String()) {
 		t.Fatalf("bad: %s", s)
 	}
 }