aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@golang.org>2012-02-22 11:22:09 +1100
committerBrad Fitzpatrick <bradfitz@golang.org>2012-02-22 11:22:09 +1100
commit9c8923f7dc4b983dca233085560adf4dc079dc25 (patch)
tree6dfa9c63a9b864ac6347d77b2106b809db238632
parent31e94293fc3f57f58bd0dae0698f0914b3e9a9e7 (diff)
downloadgo-9c8923f7dc4b983dca233085560adf4dc079dc25.tar.gz
go-9c8923f7dc4b983dca233085560adf4dc079dc25.zip
net/http: update test to use time.Duration better
R=golang-dev, dsymonds CC=golang-dev https://golang.org/cl/5688063
-rw-r--r--src/pkg/net/http/serve_test.go5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/pkg/net/http/serve_test.go b/src/pkg/net/http/serve_test.go
index e2860c3edc..b6a6b4c77d 100644
--- a/src/pkg/net/http/serve_test.go
+++ b/src/pkg/net/http/serve_test.go
@@ -245,8 +245,7 @@ func TestServerTimeouts(t *testing.T) {
fmt.Fprintf(res, "req=%d", reqNum)
})
- const second = 1000000000 /* nanos */
- server := &Server{Handler: handler, ReadTimeout: 0.25 * second, WriteTimeout: 0.25 * second}
+ server := &Server{Handler: handler, ReadTimeout: 250 * time.Millisecond, WriteTimeout: 250 * time.Millisecond}
go server.Serve(l)
url := fmt.Sprintf("http://%s/", addr)
@@ -277,7 +276,7 @@ func TestServerTimeouts(t *testing.T) {
if n != 0 || err != io.EOF {
t.Errorf("Read = %v, %v, wanted %v, %v", n, err, 0, io.EOF)
}
- if latency < 200*time.Millisecond /* fudge from 0.25 above */ {
+ if latency < 200*time.Millisecond /* fudge from 250 ms above */ {
t.Errorf("got EOF after %s, want >= %s", latency, 200*time.Millisecond)
}