aboutsummaryrefslogtreecommitdiff
path: root/src/net/http/clientserver_test.go
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@golang.org>2015-12-17 16:45:31 +0000
committerBrad Fitzpatrick <bradfitz@golang.org>2015-12-17 17:50:30 +0000
commitcfc9fde54d2d27486edede6dccf107889f0d2cc6 (patch)
tree17b4af7db9ff414fa1dbec6adaee3dc71ee476a0 /src/net/http/clientserver_test.go
parentf172a28f24664d95611b5943f78c6a2c1cc6efbd (diff)
downloadgo-cfc9fde54d2d27486edede6dccf107889f0d2cc6.tar.xz
net/http: updated bundled http2 to finish trailer support
This updates the bundled copy of x/net/http2 to git rev d2ecd08 for https://golang.org/cl/17912 (http2: send client trailers) and enables the final Trailer test for http2. Fixes #13557 Change-Id: Iaa15552b82bf7a2cb01b7787a2e1ec5ee680a9d3 Reviewed-on: https://go-review.googlesource.com/17935 Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org> Reviewed-by: Russ Cox <rsc@golang.org>
Diffstat (limited to 'src/net/http/clientserver_test.go')
-rw-r--r--src/net/http/clientserver_test.go5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/net/http/clientserver_test.go b/src/net/http/clientserver_test.go
index 00d1c58cf0..bb94e5ffea 100644
--- a/src/net/http/clientserver_test.go
+++ b/src/net/http/clientserver_test.go
@@ -469,10 +469,7 @@ func testCancelRequestMidBody(t *testing.T, h2 bool) {
// Tests that clients can send trailers to a server and that the server can read them.
func TestTrailersClientToServer_h1(t *testing.T) { testTrailersClientToServer(t, h1Mode) }
-func TestTrailersClientToServer_h2(t *testing.T) {
- t.Skip("skipping in http2 mode; golang.org/issue/13557")
- testTrailersClientToServer(t, h2Mode)
-}
+func TestTrailersClientToServer_h2(t *testing.T) { testTrailersClientToServer(t, h2Mode) }
func testTrailersClientToServer(t *testing.T, h2 bool) {
defer afterTest(t)