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>

diff --git a/src/net/http/export_test.go b/src/net/http/export_test.go
index f57e0c1585df7972f0e90759e975ee72c256b460..1825acd9be7a366d6c9940cfdc3eed93e8d214fc 100644 (file)
--- 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 174f6845aa2099ed1a4b619de16152f2ad4326fb..1ffa41150096fe768512e8de32dfe10eca98f8c9 100644 (file)
--- 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)