time: during short test, do not bother tickers take longer than expected

R=golang-dev, bradfitz
CC=golang-dev
https://golang.org/cl/5752058

diff --git a/src/pkg/time/tick_test.go b/src/pkg/time/tick_test.go
index 914f02c861c556a13f7572dea0b36bba701fda61..d8a086ceb2548725c90ecd670571386d185d435e 100644 (file)
--- a/src/pkg/time/tick_test.go
+++ b/src/pkg/time/tick_test.go
@@ -22,7 +22,7 @@ func TestTicker(t *testing.T) {
        dt := t1.Sub(t0)
        target := Delta * Count
        slop := target * 2 / 10
-       if dt < target-slop || dt > target+slop {
+       if dt < target-slop || (!testing.Short() && dt > target+slop) {
                t.Fatalf("%d %s ticks took %s, expected [%s,%s]", Count, Delta, dt, target-slop, target+slop)
        }
        // Now test that the ticker stopped