fixed tests
Juan Batiz-Benet committed
Oct 19, 2014 at 02:05 UTC
4783332b1172f0f9c0bfc251158a302fceb86a7b
3 files changed
+55
-44
net/swarm/simul_test.go
+3
-2
@@ -11,7 +11,7 @@ import (
11
)
12
13
func TestSimultOpen(t *testing.T) {
14
- t.Skip("skipping for another test")
14
+ // t.Skip("skipping for another test")
15
16
addrs := []string{
17
"/ip4/127.0.0.1/tcp/1244",
@@ -51,8 +51,9 @@ func TestSimultOpen(t *testing.T) {
51
func TestSimultOpenMany(t *testing.T) {
52
t.Skip("laggy")
53
54
+ many := 500
55
addrs := []string{}
55
- for i := 2200; i < 2300; i++ {
56
+ for i := 2200; i < (2200 + many); i++ {
57
s := fmt.Sprintf("/ip4/127.0.0.1/tcp/%d", i)
58
addrs = append(addrs, s)
59
}
net/swarm/swarm_test.go
+3
-1
@@ -164,6 +164,7 @@ func SubtestSwarm(t *testing.T, addrs []string, MsgNum int) {
164
}
165
166
func TestSwarm(t *testing.T) {
167
+ // t.Skip("skipping for another test")
168
169
addrs := []string{
170
"/ip4/127.0.0.1/tcp/1234",
@@ -173,5 +174,6 @@ func TestSwarm(t *testing.T) {
174
"/ip4/127.0.0.1/tcp/1238",
175
}
176
176
- SubtestSwarm(t, addrs, 1000)
177
+ msgs := 100
178
+ SubtestSwarm(t, addrs, msgs)
179
}
routing/dht/dht_test.go
+49
-41
@@ -112,13 +112,13 @@ func TestPing(t *testing.T) {
112
}
113
114
//Test that we can ping the node
115
- ctxT, _ := context.WithTimeout(ctx, 5*time.Millisecond)
115
+ ctxT, _ := context.WithTimeout(ctx, 100*time.Millisecond)
116
err = dhtA.Ping(ctxT, peerB)
117
if err != nil {
118
t.Fatal(err)
119
}
120
121
- ctxT, _ = context.WithTimeout(ctx, 5*time.Millisecond)
121
+ ctxT, _ = context.WithTimeout(ctx, 100*time.Millisecond)
122
err = dhtB.Ping(ctxT, peerA)
123
if err != nil {
124
t.Fatal(err)
@@ -396,53 +396,61 @@ func TestFindPeer(t *testing.T) {
396
func TestConnectCollision(t *testing.T) {
397
// t.Skip("skipping test to debug another")
398
399
- ctx := context.Background()
400
- u.Debug = false
401
- addrA, err := ma.NewMultiaddr("/ip4/127.0.0.1/tcp/1235")
402
- if err != nil {
403
- t.Fatal(err)
404
- }
405
- addrB, err := ma.NewMultiaddr("/ip4/127.0.0.1/tcp/5679")
406
- if err != nil {
407
- t.Fatal(err)
408
- }
409
-
410
- peerA := makePeer(addrA)
411
- peerB := makePeer(addrB)
412
-
413
- dhtA := setupDHT(ctx, t, peerA)
414
- dhtB := setupDHT(ctx, t, peerB)
399
+ runTimes := 100
400
416
- defer dhtA.Halt()
417
- defer dhtB.Halt()
418
- defer dhtA.network.Close()
419
- defer dhtB.network.Close()
401
+ for rtime := 0; rtime < runTimes; rtime++ {
402
+ log.Notice("Running Time: ", rtime)
403
421
- done := make(chan struct{})
422
- go func() {
423
- _, err = dhtA.Connect(ctx, peerB)
404
+ ctx := context.Background()
405
+ u.Debug = false
406
+ addrA, err := ma.NewMultiaddr("/ip4/127.0.0.1/tcp/1235")
407
if err != nil {
408
t.Fatal(err)
409
}
427
- done <- struct{}{}
428
- }()
429
- go func() {
430
- _, err = dhtB.Connect(ctx, peerA)
410
+ addrB, err := ma.NewMultiaddr("/ip4/127.0.0.1/tcp/5679")
411
if err != nil {
412
t.Fatal(err)
413
}
434
- done <- struct{}{}
435
- }()
414
437
- timeout := time.After(time.Second * 5)
438
- select {
439
- case <-done:
440
- case <-timeout:
441
- t.Fatal("Timeout received!")
442
- }
443
- select {
444
- case <-done:
445
- case <-timeout:
446
- t.Fatal("Timeout received!")
415
+ peerA := makePeer(addrA)
416
+ peerB := makePeer(addrB)
417
+
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
+
426
+ done := make(chan struct{})
427
+ go func() {
428
+ _, err = dhtA.Connect(ctx, peerB)
429
+ if err != nil {
430
+ t.Fatal(err)
431
+ }
432
+ done <- struct{}{}
433
+ }()
434
+ go func() {
435
+ _, err = dhtB.Connect(ctx, peerA)
436
+ if err != nil {
437
+ t.Fatal(err)
438
+ }
439
+ done <- struct{}{}
440
+ }()
441
+
442
+ timeout := time.After(time.Second)
443
+ select {
444
+ case <-done:
445
+ case <-timeout:
446
+ t.Fatal("Timeout received!")
447
+ }
448
+ select {
449
+ case <-done:
450
+ case <-timeout:
451
+ t.Fatal("Timeout received!")
452
+ }
453
+
454
+ <-time.After(100 * time.Millisecond)
455
}
456
}