fix swarm notif tests

jbenet · jbenet · commit 59d6a9a19cc2 · 2015-06-27T00:41:19.000-07:00
they were failing intermittently

License: MIT
Signed-off-by: Juan Batiz-Benet &lt;juan@benet.ai&gt;
diff --git a/p2p/net/swarm/swarm_notif_test.go b/p2p/net/swarm/swarm_notif_test.go
@@ -11,8 +11,6 @@ import (
 )
 
 func TestNotifications(t *testing.T) {
-	t.Parallel()
-
 	ctx := context.Background()
 	swarms := makeSwarms(ctx, t, 5)
 	defer func() {
@@ -44,24 +42,30 @@ func TestNotifications(t *testing.T) {
 				continue
 			}
 
-			cos := s.ConnectionsToPeer(s2.LocalPeer())
-			func() {
-				for i := 0; i < len(cos); i++ {
-					var c inet.Conn
-					select {
-					case c = <-n.connected:
-					case <-time.After(timeout):
-						t.Fatal("timeout")
-					}
-					for _, c2 := range cos {
-						if c == c2 {
-							t.Log("got notif for conn", c)
-							return
-						}
+			var actual []inet.Conn
+			for len(s.ConnectionsToPeer(s2.LocalPeer())) != len(actual) {
+				select {
+				case c := <-n.connected:
+					actual = append(actual, c)
+				case <-time.After(timeout):
+					t.Fatal("timeout")
+				}
+			}
+
+			expect := s.ConnectionsToPeer(s2.LocalPeer())
+			for _, c1 := range actual {
+				found := false
+				for _, c2 := range expect {
+					if c1 == c2 {
+						found = true
+						break
 					}
-					t.Error("connection not found", c)
 				}
-			}()
+				if !found {
+					t.Error("connection not found")
+				}
+			}
+
 		}
 	}
 
diff --git a/p2p/net/swarm/swarm_test.go b/p2p/net/swarm/swarm_test.go
@@ -325,6 +325,6 @@ func TestFilterBounds(t *testing.T) {
 	case <-time.After(time.Second):
 		t.Fatal("should have gotten connection")
 	case <-conns:
-		fmt.Println("got connect")
+		t.Log("got connect")
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -325,6 +325,6 @@ func TestFilterBounds(t *testing.T) {`
`325`	`325`	`case <-time.After(time.Second):`
`326`	`326`	`t.Fatal("should have gotten connection")`
`327`	`327`	`case <-conns:`
`328`		`- fmt.Println("got connect")`
	`328`	`+ t.Log("got connect")`
`329`	`329`	`}`
`330`	`330`	`}`