From c6d660a330cc12849aceb27b72abc74eb54393fe Mon Sep 17 00:00:00 2001 From: Emmanuel Odeke Date: Fri, 4 Dec 2015 16:31:20 -0700 Subject: [PATCH] net/http: make TestRedirect also test in http2 mode Change-Id: Idfbe91abc11b2b3b735cd8d11fb1938f9e5c0473 Reviewed-on: https://go-review.googlesource.com/17437 Reviewed-by: Brad Fitzpatrick Run-TryBot: Brad Fitzpatrick TryBot-Result: Gobot Gobot --- src/net/http/request_test.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/net/http/request_test.go b/src/net/http/request_test.go index 0ed68ed66a..145d108bb2 100644 --- a/src/net/http/request_test.go +++ b/src/net/http/request_test.go @@ -13,7 +13,6 @@ import ( "io/ioutil" "mime/multipart" . "net/http" - "net/http/httptest" "net/url" "os" "reflect" @@ -177,9 +176,12 @@ func TestParseMultipartForm(t *testing.T) { } } -func TestRedirect(t *testing.T) { +func TestRedirect_h1(t *testing.T) { testRedirect(t, false) } +func TestRedirect_h2(t *testing.T) { testRedirect(t, true) } + +func testRedirect(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) { switch r.URL.Path { case "/": w.Header().Set("Location", "/foo/") @@ -190,10 +192,10 @@ func TestRedirect(t *testing.T) { w.WriteHeader(StatusBadRequest) } })) - defer ts.Close() + defer cst.close() var end = regexp.MustCompile("/foo/$") - r, err := Get(ts.URL) + r, err := cst.c.Get(cst.ts.URL) if err != nil { t.Fatal(err) } -- 2.50.0