Commit dff9366e authored by Jeromy's avatar Jeromy
Browse files

make timing tests actually not run under CI



License: MIT
Signed-off-by: default avatarJeromy <jeromyj@gmail.com>
parent 034d422d
...@@ -11,8 +11,6 @@ import ( ...@@ -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) { ...@@ -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) { ...@@ -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")
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment