opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-06-29 01:12:24 +08:00
Code Issues Projects Releases Wiki Activity

make timing tests actually not run under CI

Browse Source 
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
This commit is contained in:
Jeromy
2015-07-19 16:11:06 -07:00
parent 8668f40915
commit a4efe42567
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
p2p/net/swarm/dial_test.go
View File

@ -11,8 +11,6 @@ import (
testutil "github.com/ipfs/go-ipfs/util/testutil" testutil "github.com/ipfs/go-ipfs/util/testutil"
ci "github.com/ipfs/go-ipfs/util/testutil/ci" 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" 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" 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() defer s1.Close()
s1.dialT = time.Millisecond * 300 // lower timeout for tests. s1.dialT = time.Millisecond * 300 // lower timeout for tests.
if travis.IsRunning() { if ci.IsRunning() {
s1.dialT = time.Second s1.dialT = time.Second
} }
@ -151,7 +149,7 @@ func TestDialWait(t *testing.T) {
func TestDialBackoff(t *testing.T) { func TestDialBackoff(t *testing.T) {
// t.Skip("skipping for another test") // 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") t.Skip("travis and jenkins will never have fun with this test")
} }

2
util/testutil/ci/ci.go
View File

@ -16,7 +16,7 @@ type EnvVar string
// Environment variables that TravisCI uses. // Environment variables that TravisCI uses.
const ( const (
VarCI EnvVar = "TEST_NO_FUSE" VarCI EnvVar = "CI"
VarNoFuse EnvVar = "TEST_NO_FUSE" VarNoFuse EnvVar = "TEST_NO_FUSE"
VarVerbose EnvVar = "TEST_VERBOSE" VarVerbose EnvVar = "TEST_VERBOSE"
) )