differentiate ports cause timing.
Juan Batiz-Benet committed
Oct 19, 2014 at 06:29 UTC
d17292a4c290319d72a36b544c884e2747c10b05
5 files changed
+22
-22
net/conn/conn_test.go
+2
-2
@@ -16,7 +16,7 @@ func TestClose(t *testing.T) {
16
// t.Skip("Skipping in favor of another test")
17
18
ctx, cancel := context.WithCancel(context.Background())
19
- c1, c2 := setupConn(t, ctx, "/ip4/127.0.0.1/tcp/1234", "/ip4/127.0.0.1/tcp/2345")
19
+ c1, c2 := setupConn(t, ctx, "/ip4/127.0.0.1/tcp/5534", "/ip4/127.0.0.1/tcp/5545")
20
21
select {
22
case <-c1.Closed():
@@ -49,7 +49,7 @@ func TestCancel(t *testing.T) {
49
// t.Skip("Skipping in favor of another test")
50
51
ctx, cancel := context.WithCancel(context.Background())
52
- c1, c2 := setupConn(t, ctx, "/ip4/127.0.0.1/tcp/1234", "/ip4/127.0.0.1/tcp/2345")
52
+ c1, c2 := setupConn(t, ctx, "/ip4/127.0.0.1/tcp/5534", "/ip4/127.0.0.1/tcp/5545")
53
54
select {
55
case <-c1.Closed():
net/conn/dial_test.go
+2
-2
@@ -95,12 +95,12 @@ func setupConn(t *testing.T, ctx context.Context, a1, a2 string) (a, b Conn) {
95
func TestDialer(t *testing.T) {
96
// t.Skip("Skipping in favor of another test")
97
98
- p1, err := setupPeer("/ip4/127.0.0.1/tcp/1234")
98
+ p1, err := setupPeer("/ip4/127.0.0.1/tcp/4234")
99
if err != nil {
100
t.Fatal("error setting up peer", err)
101
}
102
103
- p2, err := setupPeer("/ip4/127.0.0.1/tcp/3456")
103
+ p2, err := setupPeer("/ip4/127.0.0.1/tcp/4235")
104
if err != nil {
105
t.Fatal("error setting up peer", err)
106
}
net/conn/secure_conn_test.go
+2
-2
@@ -32,7 +32,7 @@ func TestSecureClose(t *testing.T) {
32
// t.Skip("Skipping in favor of another test")
33
34
ctx, cancel := context.WithCancel(context.Background())
35
- c1, c2 := setupConn(t, ctx, "/ip4/127.0.0.1/tcp/1234", "/ip4/127.0.0.1/tcp/2345")
35
+ c1, c2 := setupConn(t, ctx, "/ip4/127.0.0.1/tcp/6634", "/ip4/127.0.0.1/tcp/6645")
36
37
c1 = setupSecureConn(t, c1)
38
c2 = setupSecureConn(t, c2)
@@ -68,7 +68,7 @@ func TestSecureCancel(t *testing.T) {
68
// t.Skip("Skipping in favor of another test")
69
70
ctx, cancel := context.WithCancel(context.Background())
71
- c1, c2 := setupConn(t, ctx, "/ip4/127.0.0.1/tcp/1234", "/ip4/127.0.0.1/tcp/2345")
71
+ c1, c2 := setupConn(t, ctx, "/ip4/127.0.0.1/tcp/6634", "/ip4/127.0.0.1/tcp/6645")
72
73
c1 = setupSecureConn(t, c1)
74
c2 = setupSecureConn(t, c2)
net/swarm/swarm_test.go
+5
-5
@@ -174,11 +174,11 @@ func TestSwarm(t *testing.T) {
174
// t.Skip("skipping for another test")
175
176
addrs := []string{
177
- "/ip4/127.0.0.1/tcp/1234",
178
- "/ip4/127.0.0.1/tcp/1235",
179
- "/ip4/127.0.0.1/tcp/1236",
180
- "/ip4/127.0.0.1/tcp/1237",
181
- "/ip4/127.0.0.1/tcp/1238",
177
+ "/ip4/127.0.0.1/tcp/10234",
178
+ "/ip4/127.0.0.1/tcp/10235",
179
+ "/ip4/127.0.0.1/tcp/10236",
180
+ "/ip4/127.0.0.1/tcp/10237",
181
+ "/ip4/127.0.0.1/tcp/10238",
182
}
183
184
// msgs := 1000
routing/dht/dht_test.go
+11
-11
@@ -130,11 +130,11 @@ func TestValueGetSet(t *testing.T) {
130
131
ctx := context.Background()
132
u.Debug = false
133
- addrA, err := ma.NewMultiaddr("/ip4/127.0.0.1/tcp/1235")
133
+ addrA, err := ma.NewMultiaddr("/ip4/127.0.0.1/tcp/11235")
134
if err != nil {
135
t.Fatal(err)
136
}
137
- addrB, err := ma.NewMultiaddr("/ip4/127.0.0.1/tcp/5679")
137
+ addrB, err := ma.NewMultiaddr("/ip4/127.0.0.1/tcp/15679")
138
if err != nil {
139
t.Fatal(err)
140
}
@@ -396,18 +396,18 @@ func TestFindPeer(t *testing.T) {
396
func TestConnectCollision(t *testing.T) {
397
// t.Skip("skipping test to debug another")
398
399
- runTimes := 100
399
+ runTimes := 10
400
401
for rtime := 0; rtime < runTimes; rtime++ {
402
log.Notice("Running Time: ", rtime)
403
404
ctx := context.Background()
405
u.Debug = false
406
- addrA, err := ma.NewMultiaddr("/ip4/127.0.0.1/tcp/1235")
406
+ addrA, err := ma.NewMultiaddr("/ip4/127.0.0.1/tcp/11235")
407
if err != nil {
408
t.Fatal(err)
409
}
410
- addrB, err := ma.NewMultiaddr("/ip4/127.0.0.1/tcp/5679")
410
+ addrB, err := ma.NewMultiaddr("/ip4/127.0.0.1/tcp/15679")
411
if err != nil {
412
t.Fatal(err)
413
}
@@ -418,11 +418,6 @@ func TestConnectCollision(t *testing.T) {
418
dhtA := setupDHT(ctx, t, peerA)
419
dhtB := setupDHT(ctx, t, peerB)
420
421
- defer dhtA.Halt()
422
- defer dhtB.Halt()
423
- defer dhtA.network.Close()
424
- defer dhtB.network.Close()
425
-
421
done := make(chan struct{})
422
go func() {
423
_, err = dhtA.Connect(ctx, peerB)
@@ -451,6 +446,11 @@ func TestConnectCollision(t *testing.T) {
446
t.Fatal("Timeout received!")
447
}
448
454
- <-time.After(100 * time.Millisecond)
449
+ dhtA.Halt()
450
+ dhtB.Halt()
451
+ dhtA.network.Close()
452
+ dhtB.network.Close()
453
+
454
+ <-time.After(200 * time.Millisecond)
455
}
456
}