From: Emmanuel Odeke Date: Sat, 5 Dec 2015 00:21:08 +0000 (-0700) Subject: net/http: sniffTest for 5953 set in http2 mode X-Git-Tag: go1.6beta1~145 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=b220d41666aa276c72fd94f82e8ec91f146d2e49;p=gostls13.git net/http: sniffTest for 5953 set in http2 mode Change-Id: I345b6ea7024a1c85c805b2d2e22f9f79aeca5816 Reviewed-on: https://go-review.googlesource.com/17462 Run-TryBot: Brad Fitzpatrick TryBot-Result: Gobot Gobot Reviewed-by: Brad Fitzpatrick --- diff --git a/src/net/http/sniff_test.go b/src/net/http/sniff_test.go index 170de7314c..a776261cc1 100644 --- a/src/net/http/sniff_test.go +++ b/src/net/http/sniff_test.go @@ -11,7 +11,6 @@ import ( "io/ioutil" "log" . "net/http" - "net/http/httptest" "reflect" "strconv" "strings" @@ -88,15 +87,18 @@ func testServerContentType(t *testing.T, h2 bool) { // Issue 5953: shouldn't sniff if the handler set a Content-Type header, // even if it's the empty string. -func TestServerIssue5953(t *testing.T) { +func TestServerIssue5953_h1(t *testing.T) { testServerIssue5953(t, false) } +func TestServerIssue5953_h2(t *testing.T) { testServerIssue5953(t, true) } + +func testServerIssue5953(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) { w.Header()["Content-Type"] = []string{""} fmt.Fprintf(w, "hi") })) - defer ts.Close() + defer cst.close() - resp, err := Get(ts.URL) + resp, err := cst.c.Get(cst.ts.URL) if err != nil { t.Fatal(err) }