net/conns better printing of connections

net/mux.go

@@ -11,7 +11,7 @@ import (
 	lgbl "github.com/jbenet/go-ipfs/util/eventlog/loggables"
 )
 
-var log = eventlog.Logger("mux2")
+var log = eventlog.Logger("network")
 
 // Mux provides simple stream multixplexing.
 // It helps you precisely when:

net/net.go

@@ -42,6 +42,10 @@ func (s *stream) Write(p []byte) (n int, err error) {
 
 type conn_ swarm.Conn
 
+func (s *conn_) String() string {
+	return s.SwarmConn().String()
+}
+
 func (c *conn_) SwarmConn() *swarm.Conn {
 	return (*swarm.Conn)(c)
 }

net/net_test.go

 package net_test
 
 import (
+	"fmt"
 	"testing"
 
 	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
@@ -34,28 +35,37 @@ func TestConnectednessCorrect(t *testing.T) {
 
 	// test those connected show up correctly
 
-	testConnectedness := func(a, b inet.Network, c inet.Connectedness) {
-		if a.Connectedness(b.LocalPeer()) != c {
-			t.Error("%s is connected to %s, but Connectedness incorrect", a, b)
-		}
-
-		// test symmetric case
-		if b.Connectedness(a.LocalPeer()) != c {
-			t.Error("%s is connected to %s, but Connectedness incorrect", a, b)
-		}
-	}
-
 	// test connected
-	testConnectedness(nets[0], nets[1], inet.Connected)
-	testConnectedness(nets[0], nets[3], inet.Connected)
-	testConnectedness(nets[1], nets[2], inet.Connected)
-	testConnectedness(nets[3], nets[2], inet.Connected)
+	testConnectedness(t, nets[0], nets[1], inet.Connected)
+	testConnectedness(t, nets[0], nets[3], inet.Connected)
+	testConnectedness(t, nets[1], nets[2], inet.Connected)
+	testConnectedness(t, nets[3], nets[2], inet.Connected)
 
 	// test not connected
-	testConnectedness(nets[0], nets[2], inet.NotConnected)
-	testConnectedness(nets[1], nets[3], inet.NotConnected)
+	testConnectedness(t, nets[0], nets[2], inet.NotConnected)
+	testConnectedness(t, nets[1], nets[3], inet.NotConnected)
 
 	for _, n := range nets {
 		n.Close()
 	}
 }
+
+func testConnectedness(t *testing.T, a, b inet.Network, c inet.Connectedness) {
+	es := "%s is connected to %s, but Connectedness incorrect. %s %s"
+	if a.Connectedness(b.LocalPeer()) != c {
+		t.Errorf(es, a, b, printConns(a), printConns(b))
+	}
+
+	// test symmetric case
+	if b.Connectedness(a.LocalPeer()) != c {
+		t.Errorf(es, b, a, printConns(b), printConns(a))
+	}
+}
+
+func printConns(n inet.Network) string {
+	s := fmt.Sprintf("Connections in %s:\n", n)
+	for _, c := range n.Conns() {
+		s = s + fmt.Sprintf("- %s\n", c)
+	}
+	return s
+}

net/swarm/swarm_conn.go

@@ -40,6 +40,10 @@ func (c *Conn) RawConn() conn.Conn {
 	return (*ps.Conn)(c).NetConn().(conn.Conn)
 }
 
+func (c *Conn) String() string {
+	return fmt.Sprintf("<SwarmConn %s>", c.RawConn())
+}
+
 // LocalMultiaddr is the Multiaddr on this side
 func (c *Conn) LocalMultiaddr() ma.Multiaddr {
 	return c.RawConn().LocalMultiaddr()