make timing tests actually not run under CI

whyrusleeping · whyrusleeping · commit a4efe425674c · 2015-07-19T16:11:06.000-07:00
License: MIT
Signed-off-by: Jeromy &lt;jeromyj@gmail.com&gt;
diff --git 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
@@ -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"
 )

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ type EnvVar string`
`16`	`16`
`17`	`17`	`// Environment variables that TravisCI uses.`
`18`	`18`	`const (`
`19`		`- VarCI EnvVar = "TEST_NO_FUSE"`
	`19`	`+ VarCI EnvVar = "CI"`
`20`	`20`	`VarNoFuse EnvVar = "TEST_NO_FUSE"`
`21`	`21`	`VarVerbose EnvVar = "TEST_VERBOSE"`
`22`	`22`	`)`