diff options
| author | Brad Fitzpatrick <bradfitz@golang.org> | 2017-12-01 19:42:55 +0000 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@golang.org> | 2017-12-01 21:38:29 +0000 |
| commit | 8ba0933a694021fe02adbc80586bd78652f2464c (patch) | |
| tree | a3b03584dcda9c67fc414581784bf6352d9fe9ad /src/net/http | |
| parent | 496688b3cf81f92ee55c359cfbd8cd2c9d71c813 (diff) | |
| download | go-8ba0933a694021fe02adbc80586bd78652f2464c.tar.xz | |
net/http: speed up and deflake TestServerKeepAlivesEnabled_h2
Fixes #21724
Change-Id: I92571bf228781b17fdf012a2fb52a597c877cefe
Reviewed-on: https://go-review.googlesource.com/81576
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Tom Bergan <tombergan@google.com>
Diffstat (limited to 'src/net/http')
| -rw-r--r-- | src/net/http/export_test.go | 6 | ||||
| -rw-r--r-- | src/net/http/serve_test.go | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/net/http/export_test.go b/src/net/http/export_test.go index f57e0c1585..1825acd9be 100644 --- a/src/net/http/export_test.go +++ b/src/net/http/export_test.go @@ -211,3 +211,9 @@ func (s *Server) ExportAllConnsIdle() bool { func (r *Request) WithT(t *testing.T) *Request { return r.WithContext(context.WithValue(r.Context(), tLogKey{}, t.Logf)) } + +func ExportSetH2GoawayTimeout(d time.Duration) (restore func()) { + old := http2goAwayTimeout + http2goAwayTimeout = d + return func() { http2goAwayTimeout = old } +} diff --git a/src/net/http/serve_test.go b/src/net/http/serve_test.go index 174f6845aa..1ffa411500 100644 --- a/src/net/http/serve_test.go +++ b/src/net/http/serve_test.go @@ -5447,7 +5447,11 @@ func TestServerCloseDeadlock(t *testing.T) { func TestServerKeepAlivesEnabled_h1(t *testing.T) { testServerKeepAlivesEnabled(t, h1Mode) } func TestServerKeepAlivesEnabled_h2(t *testing.T) { testServerKeepAlivesEnabled(t, h2Mode) } func testServerKeepAlivesEnabled(t *testing.T, h2 bool) { - setParallel(t) + if h2 { + restore := ExportSetH2GoawayTimeout(10 * time.Millisecond) + defer restore() + } + // Not parallel: messes with global variable. (http2goAwayTimeout) defer afterTest(t) cst := newClientServerTest(t, h2, HandlerFunc(func(w ResponseWriter, r *Request) { fmt.Fprintf(w, "%v", r.RemoteAddr) |