qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-23 21:20:03 -07:00
Code Releases Activity

net/http: use iotest.ErrReader on tests

Browse Source 
Signed-off-by: Carlos Alexandro Becker <caarlos0@gmail.com>
This commit is contained in:
Carlos Alexandro Becker 2020-08-18 12:20:17 -03:00
parent 4149493443
commit 45054235a0
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/net/http/requestwrite_test.go
View File

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

9
src/net/http/transport_test.go
View File

@ -41,6 +41,7 @@ import (
"sync" "sync"
"sync/atomic" "sync/atomic"
"testing" "testing"
"testing/iotest"
"time" "time"
"golang.org/x/net/http/httpguts" "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 type closerFunc func() error
func (f closerFunc) Close() error { return f() } func (f closerFunc) Close() error { return f() }
@ -3610,7 +3605,7 @@ func TestTransportClosesBodyOnError(t *testing.T) {
io.Reader io.Reader
io.Closer 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 { closerFunc(func() error {
select { select {
case didClose <- true: case didClose <- true: