瀏覽代碼

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

Ferenc Szabo 6 年之前
父節點
當前提交
1c3aa8d9b1
共有 2 個文件被更改,包括 3 次插入5 次删除
  1. 0 3
      swarm/network/simulations/discovery/discovery_test.go
  2. 3 2
      swarm/storage/common_test.go

+ 0 - 3
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)
 					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

+ 3 - 2
swarm/storage/common_test.go

@@ -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:
-		err = fmt.Errorf("timed out after 5 seconds")
+	case <-time.NewTimer(timeout).C:
+		err = fmt.Errorf("timed out after %v", timeout)
 	}
 	}
 	return err
 	return err
 }
 }