summaryrefslogtreecommitdiff
path: root/src/net/http/responsewrite_test.go
diff options
context:
space:
mode:
authorCherry Zhang <cherryyz@google.com>2020-10-28 09:12:20 -0400
committerCherry Zhang <cherryyz@google.com>2020-10-28 09:12:20 -0400
commita16e30d162c1c7408db7821e7b9513cefa09c6ca (patch)
treeaf752ba9ba44c547df39bb0af9bff79f610ba9d5 /src/net/http/responsewrite_test.go
parent91e4d2d57bc341dd82c98247117114c851380aef (diff)
parentcf6cfba4d5358404dd890f6025e573a4b2156543 (diff)
downloadgo-git-a16e30d162c1c7408db7821e7b9513cefa09c6ca.tar.gz
[dev.link] all: merge branch 'master' into dev.linkdev.link
Clean merge. Change-Id: Ia7b2808bc649790198d34c226a61d9e569084dc5
Diffstat (limited to 'src/net/http/responsewrite_test.go')
-rw-r--r--src/net/http/responsewrite_test.go20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/net/http/responsewrite_test.go b/src/net/http/responsewrite_test.go
index d41d89896e..1cc87b942e 100644
--- a/src/net/http/responsewrite_test.go
+++ b/src/net/http/responsewrite_test.go
@@ -6,7 +6,7 @@ package http
import (
"bytes"
- "io/ioutil"
+ "io"
"strings"
"testing"
)
@@ -26,7 +26,7 @@ func TestResponseWrite(t *testing.T) {
ProtoMinor: 0,
Request: dummyReq("GET"),
Header: Header{},
- Body: ioutil.NopCloser(strings.NewReader("abcdef")),
+ Body: io.NopCloser(strings.NewReader("abcdef")),
ContentLength: 6,
},
@@ -42,7 +42,7 @@ func TestResponseWrite(t *testing.T) {
ProtoMinor: 0,
Request: dummyReq("GET"),
Header: Header{},
- Body: ioutil.NopCloser(strings.NewReader("abcdef")),
+ Body: io.NopCloser(strings.NewReader("abcdef")),
ContentLength: -1,
},
"HTTP/1.0 200 OK\r\n" +
@@ -57,7 +57,7 @@ func TestResponseWrite(t *testing.T) {
ProtoMinor: 1,
Request: dummyReq("GET"),
Header: Header{},
- Body: ioutil.NopCloser(strings.NewReader("abcdef")),
+ Body: io.NopCloser(strings.NewReader("abcdef")),
ContentLength: -1,
Close: true,
},
@@ -74,7 +74,7 @@ func TestResponseWrite(t *testing.T) {
ProtoMinor: 1,
Request: dummyReq11("GET"),
Header: Header{},
- Body: ioutil.NopCloser(strings.NewReader("abcdef")),
+ Body: io.NopCloser(strings.NewReader("abcdef")),
ContentLength: -1,
Close: false,
},
@@ -92,7 +92,7 @@ func TestResponseWrite(t *testing.T) {
ProtoMinor: 1,
Request: dummyReq11("GET"),
Header: Header{},
- Body: ioutil.NopCloser(strings.NewReader("abcdef")),
+ Body: io.NopCloser(strings.NewReader("abcdef")),
ContentLength: -1,
TransferEncoding: []string{"chunked"},
Close: false,
@@ -125,7 +125,7 @@ func TestResponseWrite(t *testing.T) {
ProtoMinor: 1,
Request: dummyReq11("GET"),
Header: Header{},
- Body: ioutil.NopCloser(strings.NewReader("")),
+ Body: io.NopCloser(strings.NewReader("")),
ContentLength: 0,
Close: false,
},
@@ -141,7 +141,7 @@ func TestResponseWrite(t *testing.T) {
ProtoMinor: 1,
Request: dummyReq11("GET"),
Header: Header{},
- Body: ioutil.NopCloser(strings.NewReader("foo")),
+ Body: io.NopCloser(strings.NewReader("foo")),
ContentLength: 0,
Close: false,
},
@@ -157,7 +157,7 @@ func TestResponseWrite(t *testing.T) {
ProtoMinor: 1,
Request: dummyReq("GET"),
Header: Header{},
- Body: ioutil.NopCloser(strings.NewReader("abcdef")),
+ Body: io.NopCloser(strings.NewReader("abcdef")),
ContentLength: 6,
TransferEncoding: []string{"chunked"},
Close: true,
@@ -218,7 +218,7 @@ func TestResponseWrite(t *testing.T) {
Request: &Request{Method: "POST"},
Header: Header{},
ContentLength: -1,
- Body: ioutil.NopCloser(strings.NewReader("abcdef")),
+ Body: io.NopCloser(strings.NewReader("abcdef")),
},
"HTTP/1.1 200 OK\r\nConnection: close\r\n\r\nabcdef",
},