From 1c3aa8d9b12d6104ccddecc1711bc6be2f5b269d Mon Sep 17 00:00:00 2001 From: Ferenc Szabo Date: Tue, 5 Feb 2019 14:34:34 +0100 Subject: [PATCH] swarm/storage: fix test timeout with -race by increasing mget timeout --- swarm/network/simulations/discovery/discovery_test.go | 3 --- swarm/storage/common_test.go | 5 +++-- 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 e695bc4ac0..86aa6f6ddd 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 bcc29d8cc7..6c737af44e 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 }