From e5da468c51ad13a08730dc7890311915eefd2199 Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Fri, 21 Aug 2020 08:01:01 +0000 Subject: [PATCH] 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 TryBot-Result: Gobot Gobot Reviewed-by: Emmanuel Odeke --- src/net/http/requestwrite_test.go | 5 +++-- src/net/http/transport_test.go | 9 ++------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/net/http/requestwrite_test.go b/src/net/http/requestwrite_test.go index b110b57b1a..fc6257cb33 100644 --- 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 0a47687d9a..2d9ca10bf0 100644 --- 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: -- 2.50.0