Merge pull request #1501 from ipfs/fix/notif-test

fix race condition in notifications test

p2p/net/mock/mock_notif_test.go

@@ -7,6 +7,7 @@ import (
 	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
 	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 	inet "github.com/ipfs/go-ipfs/p2p/net"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
 )
 
 func TestNotifications(t *testing.T) {
@@ -42,31 +43,43 @@ func TestNotifications(t *testing.T) {
 	// test everyone got the correct connection opened calls
 	for i, s := range nets {
 		n := notifiees[i]
-		for _, s2 := range nets {
-			var actual []inet.Conn
-			for len(s.ConnsToPeer(s2.LocalPeer())) != len(actual) {
+		notifs := make(map[peer.ID][]inet.Conn)
+		for j, s2 := range nets {
+			if i == j {
+				continue
+			}
+
+			// this feels a little sketchy, but its probably okay
+			for len(s.ConnsToPeer(s2.LocalPeer())) != len(notifs[s2.LocalPeer()]) {
 				select {
 				case c := <-n.connected:
-					actual = append(actual, c)
+					nfp := notifs[c.RemotePeer()]
+					notifs[c.RemotePeer()] = append(nfp, c)
 				case <-time.After(timeout):
 					t.Fatal("timeout")
 				}
 			}
+		}
+
+		for p, cons := range notifs {
+			expect := s.ConnsToPeer(p)
+			if len(expect) != len(cons) {
+				t.Fatal("got different number of connections")
+			}
 
-			expect := s.ConnsToPeer(s2.LocalPeer())
-			for _, c1 := range actual {
-				found := false
+			for _, c := range cons {
+				var found bool
 				for _, c2 := range expect {
-					if c1 == c2 {
+					if c == c2 {
 						found = true
 						break
 					}
 				}
+
 				if !found {
-					t.Error("connection not found", c1, len(expect), len(actual))
+					t.Fatal("connection not found!")
 				}
 			}
-
 		}
 	}
 

p2p/net/swarm/swarm_notif_test.go

@@ -8,6 +8,7 @@ import (
 	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 
 	inet "github.com/ipfs/go-ipfs/p2p/net"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
 )
 
 func TestNotifications(t *testing.T) {
@@ -37,35 +38,43 @@ func TestNotifications(t *testing.T) {
 	// test everyone got the correct connection opened calls
 	for i, s := range swarms {
 		n := notifiees[i]
-		for _, s2 := range swarms {
-			if s == s2 {
+		notifs := make(map[peer.ID][]inet.Conn)
+		for j, s2 := range swarms {
+			if i == j {
 				continue
 			}
 
-			var actual []inet.Conn
-			for len(s.ConnectionsToPeer(s2.LocalPeer())) != len(actual) {
+			// this feels a little sketchy, but its probably okay
+			for len(s.ConnectionsToPeer(s2.LocalPeer())) != len(notifs[s2.LocalPeer()]) {
 				select {
 				case c := <-n.connected:
-					actual = append(actual, c)
+					nfp := notifs[c.RemotePeer()]
+					notifs[c.RemotePeer()] = append(nfp, c)
 				case <-time.After(timeout):
 					t.Fatal("timeout")
 				}
 			}
+		}
+
+		for p, cons := range notifs {
+			expect := s.ConnectionsToPeer(p)
+			if len(expect) != len(cons) {
+				t.Fatal("got different number of connections")
+			}
 
-			expect := s.ConnectionsToPeer(s2.LocalPeer())
-			for _, c1 := range actual {
-				found := false
+			for _, c := range cons {
+				var found bool
 				for _, c2 := range expect {
-					if c1 == c2 {
+					if c == c2 {
 						found = true
 						break
 					}
 				}
+
 				if !found {
-					t.Error("connection not found")
+					t.Fatal("connection not found!")
 				}
 			}
-
 		}
 	}