Merge pull request #1252 from ipfs/fix-bitswap-ci

bitswap/test: fix timeout on travis
ipfs · May 19, 2015 · c153554 · c153554
2 parents c561c09 + d7794c7
commit c153554
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,4 @@
-dist: trusty
+# dist: trusty # KVM Setup
 
 os:
   - linux

diff --git a/exchange/bitswap/bitswap_test.go b/exchange/bitswap/bitswap_test.go
@@ -8,6 +8,7 @@ import (
 
 	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"
+	travis "github.com/ipfs/go-ipfs/util/testutil/ci/travis"
 
 	blocks "github.com/ipfs/go-ipfs/blocks"
 	blocksutil "github.com/ipfs/go-ipfs/blocks/blocksutil"
@@ -98,6 +99,8 @@ func TestLargeSwarm(t *testing.T) {
 		// when running with the race detector, 500 instances launches
 		// well over 8k goroutines. This hits a race detector limit.
 		numInstances = 100
+	} else if travis.IsRunning() {
+		numInstances = 200
 	} else {
 		t.Parallel()
 	}
@@ -108,7 +111,11 @@ func TestLargeFile(t *testing.T) {
 	if testing.Short() {
 		t.SkipNow()
 	}
-	t.Parallel()
+
+	if !travis.IsRunning() {
+		t.Parallel()
+	}
+
 	numInstances := 10
 	numBlocks := 100
 	PerformDistributionTest(t, numInstances, numBlocks)