From: Shenghou Ma <minux.ma@gmail.com>
Date: Tue, 6 Mar 2012 17:10:55 +0000 (+0800)
Subject: time: during short test, do not bother tickers take longer than expected
X-Git-Tag: weekly.2012-03-13~185
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=db80edde7ddd144388e367c9a8328121c98330ce;p=gostls13.git

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 914f02c861..d8a086ceb2 100644
--- 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