aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFerenc Szabo <frncmx@gmail.com>2019-02-05 21:34:34 +0800
committerRafael Matias <rafael@skyle.net>2019-02-19 20:06:14 +0800
commit3c62cc6bba7ccc1f6f646cb575c57f7b04da3507 (patch)
tree4b8927c512553c4ac49317ad22fcbfd54a6c9a49
parent333b1bfb6c95cf5453404f6117252aefff2c190f (diff)
downloaddexon-3c62cc6bba7ccc1f6f646cb575c57f7b04da3507.tar
dexon-3c62cc6bba7ccc1f6f646cb575c57f7b04da3507.tar.gz
dexon-3c62cc6bba7ccc1f6f646cb575c57f7b04da3507.tar.bz2
dexon-3c62cc6bba7ccc1f6f646cb575c57f7b04da3507.tar.lz
dexon-3c62cc6bba7ccc1f6f646cb575c57f7b04da3507.tar.xz
dexon-3c62cc6bba7ccc1f6f646cb575c57f7b04da3507.tar.zst
dexon-3c62cc6bba7ccc1f6f646cb575c57f7b04da3507.zip
swarm/storage: fix test timeout with -race by increasing mget timeout
(cherry picked from commit 1c3aa8d9b12d6104ccddecc1711bc6be2f5b269d)
-rw-r--r--swarm/network/simulations/discovery/discovery_test.go3
-rw-r--r--swarm/storage/common_test.go5
2 files changed, 3 insertions, 5 deletions
diff --git a/swarm/network/simulations/discovery/discovery_test.go b/swarm/network/simulations/discovery/discovery_test.go
index e695bc4ac..86aa6f6dd 100644
--- a/swarm/network/simulations/discovery/discovery_test.go
+++ b/swarm/network/simulations/discovery/discovery_test.go
@@ -362,9 +362,6 @@ func discoveryPersistenceSimulation(nodes, conns int, adapter adapters.NodeAdapt
return fmt.Errorf("error getting node string %s", err)
}
log.Info(nodeStr)
- for _, a := range addrs {
- log.Info(common.Bytes2Hex(a))
- }
if !healthy.ConnectNN || healthy.CountKnowNN == 0 {
isHealthy = false
break
diff --git a/swarm/storage/common_test.go b/swarm/storage/common_test.go
index 8ad95bfbc..23d43becc 100644
--- a/swarm/storage/common_test.go
+++ b/swarm/storage/common_test.go
@@ -142,10 +142,11 @@ func mget(store ChunkStore, hs []Address, f func(h Address, chunk Chunk) error)
close(errc)
}()
var err error
+ timeout := 10 * time.Second
select {
case err = <-errc:
- case <-time.NewTimer(5 * time.Second).C:
- err = fmt.Errorf("timed out after 5 seconds")
+ case <-time.NewTimer(timeout).C:
+ err = fmt.Errorf("timed out after %v", timeout)
}
return err
}