testing/ci: all env var checks now use new pkgs

Good thing, i checked one wrong, too!

fuse/ipns/ipns_test.go

@@ -5,24 +5,20 @@ import (
 	"crypto/rand"
 	"io/ioutil"
 	"os"
-	"strings"
 	"testing"
 	"time"
 
 	fstest "github.com/jbenet/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil"
+
 	core "github.com/jbenet/go-ipfs/core"
 	u "github.com/jbenet/go-ipfs/util"
+	ci "github.com/jbenet/go-ipfs/util/testutil/ci"
 )
 
-func maybeSkipFuseTests(t *testing.T) bool {
-	v := "TEST_NO_FUSE"
-	n := strings.ToLower(os.Getenv(v))
-	skip := n != "" && n != "false" && n != "f"
-
-	if skip {
-		t.Skipf("Skipping FUSE tests (%s=%s)", v, n)
+func maybeSkipFuseTests(t *testing.T) {
+	if ci.NoFuse() {
+		t.Skip("Skipping FUSE tests")
 	}
-	return skip
 }
 
 func randBytes(size int) []byte {

p2p/net/conn/conn_test.go

@@ -3,13 +3,14 @@ package conn
 import (
 	"bytes"
 	"fmt"
-	"os"
 	"runtime"
 	"sync"
 	"testing"
 	"time"
 
 	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
+
+	travis "github.com/jbenet/go-ipfs/util/testutil/ci/travis"
 )
 
 func testOneSendRecv(t *testing.T, c1, c2 Conn) {
@@ -62,7 +63,7 @@ func TestCloseLeak(t *testing.T) {
 		t.SkipNow()
 	}
 
-	if os.Getenv("TRAVIS") == "true" {
+	if travis.IsRunning() {
 		t.Skip("this doesn't work well on travis")
 	}
 

p2p/net/conn/secure_conn_test.go

@@ -2,13 +2,13 @@ package conn
 
 import (
 	"bytes"
-	"os"
 	"runtime"
 	"sync"
 	"testing"
 	"time"
 
 	ic "github.com/jbenet/go-ipfs/p2p/crypto"
+	travis "github.com/jbenet/go-ipfs/util/testutil/ci/travis"
 
 	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
 )
@@ -131,7 +131,7 @@ func TestSecureCloseLeak(t *testing.T) {
 	if testing.Short() {
 		t.SkipNow()
 	}
-	if os.Getenv("TRAVIS") == "true" {
+	if travis.IsRunning() {
 		t.Skip("this doesn't work well on travis")
 	}
 

p2p/net/swarm/dial_test.go

@@ -2,14 +2,16 @@ package swarm
 
 import (
 	"net"
-	"os"
 	"sync"
 	"testing"
 	"time"
 
 	addrutil "github.com/jbenet/go-ipfs/p2p/net/swarm/addr"
 	peer "github.com/jbenet/go-ipfs/p2p/peer"
+
 	testutil "github.com/jbenet/go-ipfs/util/testutil"
+	jenkins "github.com/jbenet/go-ipfs/util/testutil/ci/jenkins"
+	travis "github.com/jbenet/go-ipfs/util/testutil/ci/travis"
 
 	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
 	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
@@ -114,7 +116,7 @@ func TestDialWait(t *testing.T) {
 	defer s1.Close()
 
 	s1.dialT = time.Millisecond * 300 // lower timeout for tests.
-	if os.Getenv("TRAVIS") == "true" {
+	if travis.IsRunning() {
 		s1.dialT = time.Second
 	}
 
@@ -148,8 +150,8 @@ func TestDialWait(t *testing.T) {
 
 func TestDialBackoff(t *testing.T) {
 	// t.Skip("skipping for another test")
-	if os.Getenv("TRAVIS") == "true" {
-		t.Skip("travis will never have fun with this test")
+	if travis.IsRunning() || jenkins.IsRunning() {
+		t.Skip("travis and jenkins will never have fun with this test")
 	}
 
 	t.Parallel()
@@ -375,7 +377,7 @@ func TestDialBackoffClears(t *testing.T) {
 	defer s2.Close()
 	s1.dialT = time.Millisecond * 300 // lower timeout for tests.
 	s2.dialT = time.Millisecond * 300 // lower timeout for tests.
-	if os.Getenv("TRAVIS") == "true" {
+	if travis.IsRunning() {
 		s1.dialT = time.Second
 		s2.dialT = time.Second
 	}

util/ctx/fracctx_test.go

@@ -1,16 +1,17 @@
 package ctxutil
 
 import (
-	"os"
 	"testing"
 	"time"
 
+	travis "github.com/jbenet/go-ipfs/util/testutil/ci/travis"
+
 	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
 )
 
 // this test is on the context tool itself, not our stuff. it's for sanity on ours.
 func TestDeadline(t *testing.T) {
-	if os.Getenv("TRAVIS") == "true" {
+	if travis.IsRunning() {
 		t.Skip("timeouts don't work reliably on travis")
 	}
 
@@ -42,7 +43,7 @@ func TestDeadlineFractionForever(t *testing.T) {
 }
 
 func TestDeadlineFractionHalf(t *testing.T) {
-	if os.Getenv("TRAVIS") == "true" {
+	if travis.IsRunning() {
 		t.Skip("timeouts don't work reliably on travis")
 	}
 

util/testutil/ci/ci.go

@@ -42,11 +42,11 @@ func Env(v EnvVar) string {
 }
 
 // Returns whether FUSE is explicitly disabled wiht TEST_NO_FUSE.
-func NoFuse(v EnvVar) bool {
+func NoFuse() bool {
 	return os.Getenv(string(VarNoFuse)) == "1"
 }
 
 // Returns whether TEST_VERBOSE is enabled.
-func Verbose(v EnvVar) bool {
+func Verbose() bool {
 	return os.Getenv(string(VarVerbose)) == "1"
 }