diff options
| author | Shenghou Ma <minux.ma@gmail.com> | 2012-03-03 00:50:18 +0800 |
|---|---|---|
| committer | Shenghou Ma <minux.ma@gmail.com> | 2012-03-03 00:50:18 +0800 |
| commit | a3caf073a584a17eb0a7a17e1ce2ec014bae9a5c (patch) | |
| tree | 485f91506e2f3ed7e0134280db99adeba350152e | |
| parent | 6a005cb03f17a5ec544c45fc749cd4dc0227516b (diff) | |
| download | go-a3caf073a584a17eb0a7a17e1ce2ec014bae9a5c.tar.gz go-a3caf073a584a17eb0a7a17e1ce2ec014bae9a5c.zip | |
net: during short test, don't bother timeout longer than expected
R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/5716053
| -rw-r--r-- | src/pkg/net/timeout_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pkg/net/timeout_test.go b/src/pkg/net/timeout_test.go index bae37c86b2..ef350f0f94 100644 --- a/src/pkg/net/timeout_test.go +++ b/src/pkg/net/timeout_test.go @@ -40,7 +40,7 @@ func testTimeout(t *testing.T, network, addr string, readFrom bool) { errc <- fmt.Errorf("fd.%s on %s %s did not return 0, timeout: %v, %v", what, network, addr, n, err1) return } - if dt := t1.Sub(t0); dt < 50*time.Millisecond || dt > 250*time.Millisecond { + if dt := t1.Sub(t0); dt < 50*time.Millisecond || !testing.Short() && dt > 250*time.Millisecond { errc <- fmt.Errorf("fd.%s on %s %s took %s, expected 0.1s", what, network, addr, dt) return } |