From: Emmanuel Odeke Date: Fri, 4 Dec 2015 22:31:46 +0000 (-0700) Subject: net/http: testHeadResponses port for h2 X-Git-Tag: go1.6beta1~192 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=983926a728ef74d66461dce0dd5a975939beb8d4;p=gostls13.git net/http: testHeadResponses port for h2 Change-Id: I4cf4596a305510cd25df34ecebd11a19266415f1 Reviewed-on: https://go-review.googlesource.com/17435 Run-TryBot: Brad Fitzpatrick TryBot-Result: Gobot Gobot Reviewed-by: Brad Fitzpatrick --- diff --git a/src/net/http/serve_test.go b/src/net/http/serve_test.go index 91eab137b7..da6dbfd57e 100644 --- a/src/net/http/serve_test.go +++ b/src/net/http/serve_test.go @@ -890,9 +890,12 @@ func TestIdentityResponseHeaders(t *testing.T) { // TestHeadResponses verifies that all MIME type sniffing and Content-Length // counting of GET requests also happens on HEAD requests. -func TestHeadResponses(t *testing.T) { +func TestHeadResponses_h1(t *testing.T) { testHeadResponses(t, false) } +func TestHeadResponses_h2(t *testing.T) { testHeadResponses(t, true) } + +func testHeadResponses(t *testing.T, h2 bool) { defer afterTest(t) - ts := httptest.NewServer(HandlerFunc(func(w ResponseWriter, r *Request) { + cst := newClientServerTest(t, h2, HandlerFunc(func(w ResponseWriter, r *Request) { _, err := w.Write([]byte("")) if err != nil { t.Errorf("ResponseWriter.Write: %v", err) @@ -904,8 +907,8 @@ func TestHeadResponses(t *testing.T) { t.Errorf("Copy(ResponseWriter, ...): %v", err) } })) - defer ts.Close() - res, err := Head(ts.URL) + defer cst.close() + res, err := cst.c.Head(cst.ts.URL) if err != nil { t.Error(err) }