From a4efe425674cb6f35d3097a4f41277d108e5d4fe Mon Sep 17 00:00:00 2001 From: Jeromy Date: Sun, 19 Jul 2015 16:11:06 -0700 Subject: [PATCH] make timing tests actually not run under CI License: MIT Signed-off-by: Jeromy --- p2p/net/swarm/dial_test.go | 6 ++---- util/testutil/ci/ci.go | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/p2p/net/swarm/dial_test.go b/p2p/net/swarm/dial_test.go index e9c9aa155..0ed10f4d3 100644 --- a/p2p/net/swarm/dial_test.go +++ b/p2p/net/swarm/dial_test.go @@ -11,8 +11,6 @@ import ( testutil "github.com/ipfs/go-ipfs/util/testutil" ci "github.com/ipfs/go-ipfs/util/testutil/ci" - jenkins "github.com/ipfs/go-ipfs/util/testutil/ci/jenkins" - travis "github.com/ipfs/go-ipfs/util/testutil/ci/travis" ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" manet "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net" @@ -117,7 +115,7 @@ func TestDialWait(t *testing.T) { defer s1.Close() s1.dialT = time.Millisecond * 300 // lower timeout for tests. - if travis.IsRunning() { + if ci.IsRunning() { s1.dialT = time.Second } @@ -151,7 +149,7 @@ func TestDialWait(t *testing.T) { func TestDialBackoff(t *testing.T) { // t.Skip("skipping for another test") - if travis.IsRunning() || jenkins.IsRunning() { + if ci.IsRunning() { t.Skip("travis and jenkins will never have fun with this test") } diff --git a/util/testutil/ci/ci.go b/util/testutil/ci/ci.go index 1ae268087..df5e87b8d 100644 --- a/util/testutil/ci/ci.go +++ b/util/testutil/ci/ci.go @@ -16,7 +16,7 @@ type EnvVar string // Environment variables that TravisCI uses. const ( - VarCI EnvVar = "TEST_NO_FUSE" + VarCI EnvVar = "CI" VarNoFuse EnvVar = "TEST_NO_FUSE" VarVerbose EnvVar = "TEST_VERBOSE" )