aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEmmanuel Odeke <emm.odeke@gmail.com>2015-12-04 23:22:26 -0700
committerBrad Fitzpatrick <bradfitz@golang.org>2015-12-07 15:50:34 +0000
commit3d70475833bcf1ee83e09eca21aa4a58a492d2a0 (patch)
treef311a812bf9d1f7094c654f52c30219828eb5eb3 /src
parentc34bc90ffca18af9e396bde2f16abbc1757d858e (diff)
downloadgo-3d70475833bcf1ee83e09eca21aa4a58a492d2a0.tar.xz
net/http: sniffWrite test also in http2 mode
Change-Id: Ifa9f1ed6a3b8d3f7536f2d315259940335b0ee49 Reviewed-on: https://go-review.googlesource.com/17438 Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org> Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org> TryBot-Result: Gobot Gobot <gobot@golang.org>
Diffstat (limited to 'src')
-rw-r--r--src/net/http/sniff_test.go11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/net/http/sniff_test.go b/src/net/http/sniff_test.go
index 293a7f52d0..170de7314c 100644
--- a/src/net/http/sniff_test.go
+++ b/src/net/http/sniff_test.go
@@ -146,9 +146,12 @@ func testContentTypeWithCopy(t *testing.T, h2 bool) {
resp.Body.Close()
}
-func TestSniffWriteSize(t *testing.T) {
+func TestSniffWriteSize_h1(t *testing.T) { testSniffWriteSize(t, false) }
+func TestSniffWriteSize_h2(t *testing.T) { testSniffWriteSize(t, true) }
+
+func testSniffWriteSize(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) {
size, _ := strconv.Atoi(r.FormValue("size"))
written, err := io.WriteString(w, strings.Repeat("a", size))
if err != nil {
@@ -159,9 +162,9 @@ func TestSniffWriteSize(t *testing.T) {
t.Errorf("write of %d bytes wrote %d bytes", size, written)
}
}))
- defer ts.Close()
+ defer cst.close()
for _, size := range []int{0, 1, 200, 600, 999, 1000, 1023, 1024, 512 << 10, 1 << 20} {
- res, err := Get(fmt.Sprintf("%s/?size=%d", ts.URL, size))
+ res, err := cst.c.Get(fmt.Sprintf("%s/?size=%d", cst.ts.URL, size))
if err != nil {
t.Fatalf("size %d: %v", size, err)
}