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

pull/19005/head
Ferenc Szabo 6 years ago committed by Anton Evangelatov
parent f413a3dbb2
commit 1c3aa8d9b1
  1. 3
      swarm/network/simulations/discovery/discovery_test.go
  2. 5
      swarm/storage/common_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

@ -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
}

Loading…
Cancel
Save