提交 bc6911ef 作者: Juan Batiz-Benet

bitswap/test: fix timeout on travis

上级 c561c098
...@@ -8,6 +8,7 @@ import ( ...@@ -8,6 +8,7 @@ import (
detectrace "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-detect-race" detectrace "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-detect-race"
context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
travis "github.com/ipfs/go-ipfs/util/testutil/ci/travis"
blocks "github.com/ipfs/go-ipfs/blocks" blocks "github.com/ipfs/go-ipfs/blocks"
blocksutil "github.com/ipfs/go-ipfs/blocks/blocksutil" blocksutil "github.com/ipfs/go-ipfs/blocks/blocksutil"
...@@ -98,6 +99,8 @@ func TestLargeSwarm(t *testing.T) { ...@@ -98,6 +99,8 @@ func TestLargeSwarm(t *testing.T) {
// when running with the race detector, 500 instances launches // when running with the race detector, 500 instances launches
// well over 8k goroutines. This hits a race detector limit. // well over 8k goroutines. This hits a race detector limit.
numInstances = 100 numInstances = 100
} else if travis.IsRunning() {
numInstances = 200
} else { } else {
t.Parallel() t.Parallel()
} }
...@@ -108,7 +111,11 @@ func TestLargeFile(t *testing.T) { ...@@ -108,7 +111,11 @@ func TestLargeFile(t *testing.T) {
if testing.Short() { if testing.Short() {
t.SkipNow() t.SkipNow()
} }
t.Parallel()
if !travis.IsRunning() {
t.Parallel()
}
numInstances := 10 numInstances := 10
numBlocks := 100 numBlocks := 100
PerformDistributionTest(t, numInstances, numBlocks) PerformDistributionTest(t, numInstances, numBlocks)
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论