From a3caf073a584a17eb0a7a17e1ce2ec014bae9a5c Mon Sep 17 00:00:00 2001 From: Shenghou Ma Date: Sat, 3 Mar 2012 00:50:18 +0800 Subject: [PATCH] net: during short test, don't bother timeout longer than expected R=golang-dev, rsc CC=golang-dev https://golang.org/cl/5716053 --- src/pkg/net/timeout_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 } -- 2.50.0