net/http: use iotest.ErrReader in tests

Updates #38781

Change-Id: I16a66904167ca4c0e916619b4da1dd23795b3ab2
GitHub-Last-Rev: 45054235a009cf776030bc951ba9a2a2a02c13e9
GitHub-Pull-Request: golang/go#40864
Reviewed-on: https://go-review.googlesource.com/c/go/+/249037
Run-TryBot: Emmanuel Odeke <emm.odeke@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Emmanuel Odeke <emm.odeke@gmail.com>

diff --git a/src/net/http/requestwrite_test.go b/src/net/http/requestwrite_test.go
index b110b57b1ab922ec213c10311891c1a2eb6dd9ad..fc6257cb3380b3dc43327ac80f6880a70b8e10e0 100644 (file)
--- a/src/net/http/requestwrite_test.go
+++ b/src/net/http/requestwrite_test.go
@@ -15,6 +15,7 @@ import (
        "net/url"
        "strings"
        "testing"
+       "testing/iotest"
        "time"
 )
 
@@ -349,7 +350,7 @@ var reqWriteTests = []reqWriteTest{
 
                Body: func() io.ReadCloser {
                        err := errors.New("Custom reader error")
-                       errReader := &errorReader{err}
+                       errReader := iotest.ErrReader(err)
                        return ioutil.NopCloser(io.MultiReader(strings.NewReader("x"), errReader))
                },
 
@@ -369,7 +370,7 @@ var reqWriteTests = []reqWriteTest{
 
                Body: func() io.ReadCloser {
                        err := errors.New("Custom reader error")
-                       errReader := &errorReader{err}
+                       errReader := iotest.ErrReader(err)
                        return ioutil.NopCloser(errReader)
                },
 

diff --git a/src/net/http/transport_test.go b/src/net/http/transport_test.go
index 0a47687d9afbacac2ac7411c2e91e41b8b0915a9..2d9ca10bf0d1c1eab79ae1c439d74e9b390e882d 100644 (file)
--- a/src/net/http/transport_test.go
+++ b/src/net/http/transport_test.go
@@ -41,6 +41,7 @@ import (
        "sync"
        "sync/atomic"
        "testing"
+       "testing/iotest"
        "time"
 
        "golang.org/x/net/http/httpguts"
@@ -3408,12 +3409,6 @@ func TestTransportIssue10457(t *testing.T) {
        }
 }
 
-type errorReader struct {
-       err error
-}
-
-func (e errorReader) Read(p []byte) (int, error) { return 0, e.err }
-
 type closerFunc func() error
 
 func (f closerFunc) Close() error { return f() }
@@ -3610,7 +3605,7 @@ func TestTransportClosesBodyOnError(t *testing.T) {
                io.Reader
                io.Closer
        }{
-               io.MultiReader(io.LimitReader(neverEnding('x'), 1<<20), errorReader{fakeErr}),
+               io.MultiReader(io.LimitReader(neverEnding('x'), 1<<20), iotest.ErrReader(fakeErr)),
                closerFunc(func() error {
                        select {
                        case didClose <- true: