From 66503701ac10581e8e46a043c95bc7b42dbe5e73 Mon Sep 17 00:00:00 2001 From: Juan Batiz-Benet Date: Sat, 24 Jan 2015 10:34:26 -0800 Subject: [PATCH] dht: TestConnectCollision skip in Travis + longer timeout --- routing/dht/dht_test.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/routing/dht/dht_test.go b/routing/dht/dht_test.go index 1b274395a..2d8494b65 100644 --- a/routing/dht/dht_test.go +++ b/routing/dht/dht_test.go @@ -19,7 +19,9 @@ import ( netutil "github.com/jbenet/go-ipfs/p2p/test/util" routing "github.com/jbenet/go-ipfs/routing" u "github.com/jbenet/go-ipfs/util" + ci "github.com/jbenet/go-ipfs/util/testutil/ci" + travisci "github.com/jbenet/go-ipfs/util/testutil/ci/travis" ) var testCaseValues = map[u.Key][]byte{} @@ -738,6 +740,9 @@ func TestConnectCollision(t *testing.T) { if testing.Short() { t.SkipNow() } + if travisci.IsRunning() { + t.Skip("Skipping on Travis-CI.") + } runTimes := 10 @@ -767,7 +772,7 @@ func TestConnectCollision(t *testing.T) { errs <- err }() - timeout := time.After(time.Second) + timeout := time.After(5 * time.Second) select { case e := <-errs: if e != nil {