gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

swarm/storage: fix test timeout with -race by increasing mget timeout

Browse Source 
(cherry picked from commit 1c3aa8d9b12d6104ccddecc1711bc6be2f5b269d)
This commit is contained in:
Ferenc Szabo 2019-02-05 14:34:34 +01:00 committed by Rafael Matias
parent 333b1bfb6c
commit 3c62cc6bba
No known key found for this signature in database
GPG Key ID: 1BC39532FB4A2DBD
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swarm/network/simulations/discovery/discovery_test.go
View File

@ -362,9 +362,6 @@ func discoveryPersistenceSimulation(nodes, conns int, adapter adapters.NodeAdapt
return fmt.Errorf("error getting node string %s", err) return fmt.Errorf("error getting node string %s", err)
} }
log.Info(nodeStr) log.Info(nodeStr)
for _, a := range addrs {
log.Info(common.Bytes2Hex(a))
}
if !healthy.ConnectNN || healthy.CountKnowNN == 0 { if !healthy.ConnectNN || healthy.CountKnowNN == 0 {
isHealthy = false isHealthy = false
break break

5
swarm/storage/common_test.go
View File

@ -142,10 +142,11 @@ func mget(store ChunkStore, hs []Address, f func(h Address, chunk Chunk) error)
close(errc) close(errc)
}() }()
var err error var err error
timeout := 10 * time.Second
select { select {
case err = <-errc: case err = <-errc:
case <-time.NewTimer(5 * time.Second).C: case <-time.NewTimer(timeout).C:
err = fmt.Errorf("timed out after 5 seconds") err = fmt.Errorf("timed out after %v", timeout)
} }
return err return err
} }