net: during short test, don't bother timeout longer than expected

R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/5716053

diff --git a/src/pkg/net/timeout_test.go b/src/pkg/net/timeout_test.go
index bae37c86b2ed3b32fa511b387b5fca94b8f5c2d7..ef350f0f946f99fad4c4a996a8cc703ff3507f1f 100644 (file)
--- 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
                }