coosld/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2026-03-10 02:40:11 +08:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity

Merge pull request #1499 from ipfs/fix/ci-test-skip

Browse Source 
make timing tests actually not run under CI
This commit is contained in:
Juan Benet 2015-07-19 16:26:17 -07:00
commit f5b8952503
2 changed files with 3 additions and 5 deletions
Show Stats 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"
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")
}

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

@ -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"
)