make timing tests actually not run under CI
License: MIT Signed-off-by: Jeromy <jeromyj@gmail.com>
Jeromy committed
Jul 19, 2015 at 16:11 UTC
a4efe425674cb6f35d3097a4f41277d108e5d4fe
2 files changed
+3
-5
p2p/net/swarm/dial_test.go
+2
-4
@@ -11,8 +11,6 @@ import (
11
12
testutil "github.com/ipfs/go-ipfs/util/testutil"
13
ci "github.com/ipfs/go-ipfs/util/testutil/ci"
14
- jenkins "github.com/ipfs/go-ipfs/util/testutil/ci/jenkins"
15
- travis "github.com/ipfs/go-ipfs/util/testutil/ci/travis"
14
15
ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
16
manet "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net"
@@ -117,7 +115,7 @@ func TestDialWait(t *testing.T) {
115
defer s1.Close()
116
117
s1.dialT = time.Millisecond * 300 // lower timeout for tests.
120
- if travis.IsRunning() {
118
+ if ci.IsRunning() {
119
s1.dialT = time.Second
120
}
121
@@ -151,7 +149,7 @@ func TestDialWait(t *testing.T) {
149
150
func TestDialBackoff(t *testing.T) {
151
// t.Skip("skipping for another test")
154
- if travis.IsRunning() || jenkins.IsRunning() {
152
+ if ci.IsRunning() {
153
t.Skip("travis and jenkins will never have fun with this test")
154
}
155
util/testutil/ci/ci.go
+1
-1
@@ -16,7 +16,7 @@ type EnvVar string
16
17
// Environment variables that TravisCI uses.
18
const (
19
- VarCI EnvVar = "TEST_NO_FUSE"
19
+ VarCI EnvVar = "CI"
20
VarNoFuse EnvVar = "TEST_NO_FUSE"
21
VarVerbose EnvVar = "TEST_VERBOSE"
22
)