diff options
| author | Ferenc Szabo <frncmx@gmail.com> | 2019-02-09 00:07:11 +0800 |
|---|---|---|
| committer | Rafael Matias <rafael@skyle.net> | 2019-02-19 20:11:51 +0800 |
| commit | dcff622d43c6b7e41153d3f082e84a0718cb81c7 (patch) | |
| tree | ef229ab35c7423d1e7f52fe644b57218abbc8d32 /swarm/network | |
| parent | a3db00f2700a305279efa34420cbb90e7fe279fc (diff) | |
| download | dexon-dcff622d43c6b7e41153d3f082e84a0718cb81c7.tar dexon-dcff622d43c6b7e41153d3f082e84a0718cb81c7.tar.gz dexon-dcff622d43c6b7e41153d3f082e84a0718cb81c7.tar.bz2 dexon-dcff622d43c6b7e41153d3f082e84a0718cb81c7.tar.lz dexon-dcff622d43c6b7e41153d3f082e84a0718cb81c7.tar.xz dexon-dcff622d43c6b7e41153d3f082e84a0718cb81c7.tar.zst dexon-dcff622d43c6b7e41153d3f082e84a0718cb81c7.zip | |
swarm: CI race detector test adjustments (#19017)
(cherry picked from commit 27e3f968194e2723279b60f71c79d4da9fc7577f)
Diffstat (limited to 'swarm/network')
| -rw-r--r-- | swarm/network/networkid_test.go | 4 | ||||
| -rw-r--r-- | swarm/network/simulations/overlay_test.go | 2 | ||||
| -rw-r--r-- | swarm/network/stream/snapshot_retrieval_test.go | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/swarm/network/networkid_test.go b/swarm/network/networkid_test.go index 8e68e5b52..9d47cf9f6 100644 --- a/swarm/network/networkid_test.go +++ b/swarm/network/networkid_test.go @@ -44,7 +44,7 @@ var ( const ( NumberOfNets = 4 - MaxTimeout = 6 + MaxTimeout = 15 * time.Second ) func init() { @@ -146,7 +146,7 @@ func setupNetwork(numnodes int) (net *simulations.Network, err error) { return nil, fmt.Errorf("create node %d rpc client fail: %v", i, err) } //now setup and start event watching in order to know when we can upload - ctx, watchCancel := context.WithTimeout(context.Background(), MaxTimeout*time.Second) + ctx, watchCancel := context.WithTimeout(context.Background(), MaxTimeout) defer watchCancel() watchSubscriptionEvents(ctx, nodes[i].ID(), client, errc, quitC) //on every iteration we connect to all previous ones diff --git a/swarm/network/simulations/overlay_test.go b/swarm/network/simulations/overlay_test.go index 6ccdb5ce2..05d403173 100644 --- a/swarm/network/simulations/overlay_test.go +++ b/swarm/network/simulations/overlay_test.go @@ -32,7 +32,7 @@ import ( ) var ( - nodeCount = 16 + nodeCount = 10 ) //This test is used to test the overlay simulation. diff --git a/swarm/network/stream/snapshot_retrieval_test.go b/swarm/network/stream/snapshot_retrieval_test.go index f097e4180..0f20f1be0 100644 --- a/swarm/network/stream/snapshot_retrieval_test.go +++ b/swarm/network/stream/snapshot_retrieval_test.go @@ -151,7 +151,7 @@ func runFileRetrievalTest(nodeCount int) error { return err } - ctx, cancelSimRun := context.WithTimeout(context.Background(), 1*time.Minute) + ctx, cancelSimRun := context.WithTimeout(context.Background(), 3*time.Minute) defer cancelSimRun() result := sim.Run(ctx, func(ctx context.Context, sim *simulation.Simulation) error { |