diff options
| author | Janoš Guljaš <janos@users.noreply.github.com> | 2018-08-06 17:33:22 +0800 |
|---|---|---|
| committer | Péter Szilágyi <peterke@gmail.com> | 2018-08-06 17:33:22 +0800 |
| commit | a72ba5a55be3abb1be85126838ee0b4a9c475be4 (patch) | |
| tree | 6c02c730ded55f6842778618ba06ae3d52d06bdf /swarm/network/stream | |
| parent | 6711f098d5f070fbb26a4dd7899e3c6c766f4477 (diff) | |
| download | go-tangerine-a72ba5a55be3abb1be85126838ee0b4a9c475be4.tar go-tangerine-a72ba5a55be3abb1be85126838ee0b4a9c475be4.tar.gz go-tangerine-a72ba5a55be3abb1be85126838ee0b4a9c475be4.tar.bz2 go-tangerine-a72ba5a55be3abb1be85126838ee0b4a9c475be4.tar.lz go-tangerine-a72ba5a55be3abb1be85126838ee0b4a9c475be4.tar.xz go-tangerine-a72ba5a55be3abb1be85126838ee0b4a9c475be4.tar.zst go-tangerine-a72ba5a55be3abb1be85126838ee0b4a9c475be4.zip | |
cmd/swarm, swarm: various test fixes (#17299)
* swarm/network/simulation: increase the sleep duration for TestRun
* cmd/swarm, swarm: fix failing tests on mac
* cmd/swarm: update TestCLISwarmFs skip comment
* swarm/network/simulation: adjust disconnections on simulation close
* swarm/network/simulation: call cleanups after net shutdown
Diffstat (limited to 'swarm/network/stream')
| -rw-r--r-- | swarm/network/stream/delivery_test.go | 10 | ||||
| -rw-r--r-- | swarm/network/stream/snapshot_sync_test.go | 4 |
2 files changed, 9 insertions, 5 deletions
diff --git a/swarm/network/stream/delivery_test.go b/swarm/network/stream/delivery_test.go index ae007e5b0..972cc859a 100644 --- a/swarm/network/stream/delivery_test.go +++ b/swarm/network/stream/delivery_test.go @@ -393,6 +393,11 @@ func testDeliveryFromNodes(t *testing.T, nodes, conns, chunkCount int, skipCheck return err } + log.Debug("Waiting for kademlia") + if _, err := sim.WaitTillHealthy(ctx, 2); err != nil { + return err + } + //each of the nodes (except pivot node) subscribes to the stream of the next node for j, node := range nodeIDs[0 : nodes-1] { sid := nodeIDs[j+1] @@ -424,11 +429,6 @@ func testDeliveryFromNodes(t *testing.T, nodes, conns, chunkCount int, skipCheck } }() - log.Debug("Waiting for kademlia") - if _, err := sim.WaitTillHealthy(ctx, 2); err != nil { - return err - } - log.Debug("Watching for disconnections") disconnections := sim.PeerEvents( context.Background(), diff --git a/swarm/network/stream/snapshot_sync_test.go b/swarm/network/stream/snapshot_sync_test.go index 2dfc5898f..6acab50af 100644 --- a/swarm/network/stream/snapshot_sync_test.go +++ b/swarm/network/stream/snapshot_sync_test.go @@ -246,6 +246,8 @@ func testSyncingViaGlobalSync(t *testing.T, chunkCount int, nodeCount int) { if err != nil { log.Warn(fmt.Sprintf("Chunk %s NOT found for id %s", chunk, id)) localSuccess = false + // Do not get crazy with logging the warn message + time.Sleep(500 * time.Millisecond) } else { log.Debug(fmt.Sprintf("Chunk %s IS FOUND for id %s", chunk, id)) } @@ -426,6 +428,8 @@ func testSyncingViaDirectSubscribe(chunkCount int, nodeCount int) error { if err != nil { log.Warn(fmt.Sprintf("Chunk %s NOT found for id %s", chunk, id)) localSuccess = false + // Do not get crazy with logging the warn message + time.Sleep(500 * time.Millisecond) } else { log.Debug(fmt.Sprintf("Chunk %s IS FOUND for id %s", chunk, id)) } |