differentiate ports cause timing.

net/conn/conn_test.go

@@ -16,7 +16,7 @@ func TestClose(t *testing.T) {
 	// t.Skip("Skipping in favor of another test")
 
 	ctx, cancel := context.WithCancel(context.Background())
-	c1, c2 := setupConn(t, ctx, "/ip4/127.0.0.1/tcp/1234", "/ip4/127.0.0.1/tcp/2345")
+	c1, c2 := setupConn(t, ctx, "/ip4/127.0.0.1/tcp/5534", "/ip4/127.0.0.1/tcp/5545")
 
 	select {
 	case <-c1.Closed():
@@ -49,7 +49,7 @@ func TestCancel(t *testing.T) {
 	// t.Skip("Skipping in favor of another test")
 
 	ctx, cancel := context.WithCancel(context.Background())
-	c1, c2 := setupConn(t, ctx, "/ip4/127.0.0.1/tcp/1234", "/ip4/127.0.0.1/tcp/2345")
+	c1, c2 := setupConn(t, ctx, "/ip4/127.0.0.1/tcp/5534", "/ip4/127.0.0.1/tcp/5545")
 
 	select {
 	case <-c1.Closed():

net/conn/dial_test.go

@@ -95,12 +95,12 @@ func setupConn(t *testing.T, ctx context.Context, a1, a2 string) (a, b Conn) {
 func TestDialer(t *testing.T) {
 	// t.Skip("Skipping in favor of another test")
 
-	p1, err := setupPeer("/ip4/127.0.0.1/tcp/1234")
+	p1, err := setupPeer("/ip4/127.0.0.1/tcp/4234")
 	if err != nil {
 		t.Fatal("error setting up peer", err)
 	}
 
-	p2, err := setupPeer("/ip4/127.0.0.1/tcp/3456")
+	p2, err := setupPeer("/ip4/127.0.0.1/tcp/4235")
 	if err != nil {
 		t.Fatal("error setting up peer", err)
 	}

net/conn/secure_conn_test.go

@@ -32,7 +32,7 @@ func TestSecureClose(t *testing.T) {
 	// t.Skip("Skipping in favor of another test")
 
 	ctx, cancel := context.WithCancel(context.Background())
-	c1, c2 := setupConn(t, ctx, "/ip4/127.0.0.1/tcp/1234", "/ip4/127.0.0.1/tcp/2345")
+	c1, c2 := setupConn(t, ctx, "/ip4/127.0.0.1/tcp/6634", "/ip4/127.0.0.1/tcp/6645")
 
 	c1 = setupSecureConn(t, c1)
 	c2 = setupSecureConn(t, c2)
@@ -68,7 +68,7 @@ func TestSecureCancel(t *testing.T) {
 	// t.Skip("Skipping in favor of another test")
 
 	ctx, cancel := context.WithCancel(context.Background())
-	c1, c2 := setupConn(t, ctx, "/ip4/127.0.0.1/tcp/1234", "/ip4/127.0.0.1/tcp/2345")
+	c1, c2 := setupConn(t, ctx, "/ip4/127.0.0.1/tcp/6634", "/ip4/127.0.0.1/tcp/6645")
 
 	c1 = setupSecureConn(t, c1)
 	c2 = setupSecureConn(t, c2)

net/swarm/swarm_test.go

@@ -174,11 +174,11 @@ func TestSwarm(t *testing.T) {
 	// t.Skip("skipping for another test")
 
 	addrs := []string{
-		"/ip4/127.0.0.1/tcp/1234",
-		"/ip4/127.0.0.1/tcp/1235",
-		"/ip4/127.0.0.1/tcp/1236",
-		"/ip4/127.0.0.1/tcp/1237",
-		"/ip4/127.0.0.1/tcp/1238",
+		"/ip4/127.0.0.1/tcp/10234",
+		"/ip4/127.0.0.1/tcp/10235",
+		"/ip4/127.0.0.1/tcp/10236",
+		"/ip4/127.0.0.1/tcp/10237",
+		"/ip4/127.0.0.1/tcp/10238",
 	}
 
 	// msgs := 1000

routing/dht/dht_test.go

@@ -130,11 +130,11 @@ func TestValueGetSet(t *testing.T) {
 
 	ctx := context.Background()
 	u.Debug = false
-	addrA, err := ma.NewMultiaddr("/ip4/127.0.0.1/tcp/1235")
+	addrA, err := ma.NewMultiaddr("/ip4/127.0.0.1/tcp/11235")
 	if err != nil {
 		t.Fatal(err)
 	}
-	addrB, err := ma.NewMultiaddr("/ip4/127.0.0.1/tcp/5679")
+	addrB, err := ma.NewMultiaddr("/ip4/127.0.0.1/tcp/15679")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -396,18 +396,18 @@ func TestFindPeer(t *testing.T) {
 func TestConnectCollision(t *testing.T) {
 	// t.Skip("skipping test to debug another")
 
-	runTimes := 100
+	runTimes := 10
 
 	for rtime := 0; rtime < runTimes; rtime++ {
 		log.Notice("Running Time: ", rtime)
 
 		ctx := context.Background()
 		u.Debug = false
-		addrA, err := ma.NewMultiaddr("/ip4/127.0.0.1/tcp/1235")
+		addrA, err := ma.NewMultiaddr("/ip4/127.0.0.1/tcp/11235")
 		if err != nil {
 			t.Fatal(err)
 		}
-		addrB, err := ma.NewMultiaddr("/ip4/127.0.0.1/tcp/5679")
+		addrB, err := ma.NewMultiaddr("/ip4/127.0.0.1/tcp/15679")
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -418,11 +418,6 @@ func TestConnectCollision(t *testing.T) {
 		dhtA := setupDHT(ctx, t, peerA)
 		dhtB := setupDHT(ctx, t, peerB)
 
-		defer dhtA.Halt()
-		defer dhtB.Halt()
-		defer dhtA.network.Close()
-		defer dhtB.network.Close()
-
 		done := make(chan struct{})
 		go func() {
 			_, err = dhtA.Connect(ctx, peerB)
@@ -451,6 +446,11 @@ func TestConnectCollision(t *testing.T) {
 			t.Fatal("Timeout received!")
 		}
 
-		<-time.After(100 * time.Millisecond)
+		dhtA.Halt()
+		dhtB.Halt()
+		dhtA.network.Close()
+		dhtB.network.Close()
+
+		<-time.After(200 * time.Millisecond)
 	}
 }