qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-18 10:04:43 -07:00
Code Releases Activity

net/http: remove workaround in TestTransportClosesBodyOnError on Plan 9

Browse Source 
This issue has been fixed in CL 31390.

Fixes #9554.

Change-Id: Ib8ff4cb1ffcb7cdbf117510b98b4a7e13e4efd2b
Reviewed-on: https://go-review.googlesource.com/31520
TryBot-Result: Gobot Gobot <gobot@golang.org>
Run-TryBot: David du Colombier <0intro@gmail.com>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
This commit is contained in:
David du Colombier 2016-10-20 16:51:03 +02:00 committed by Brad Fitzpatrick
parent 8589049d5c
commit f9bbfe4a09
1 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2485,22 +2485,6 @@ type errorReader struct {
func (e errorReader) Read(p []byte) (int, error) { return 0, e.err } func (e errorReader) Read(p []byte) (int, error) { return 0, e.err }
type plan9SleepReader struct{}
func (plan9SleepReader) Read(p []byte) (int, error) {
if runtime.GOOS == "plan9" {
// After the fix to unblock TCP Reads in
// https://golang.org/cl/15941, this sleep is required
// on plan9 to make sure TCP Writes before an
// immediate TCP close go out on the wire. On Plan 9,
// it seems that a hangup of a TCP connection with
// queued data doesn't send the queued data first.
// https://golang.org/issue/9554
time.Sleep(50 * time.Millisecond)
}
return 0, io.EOF
}
type closerFunc func() error type closerFunc func() error
func (f closerFunc) Close() error { return f() } func (f closerFunc) Close() error { return f() }
@ -2595,7 +2579,7 @@ func TestTransportClosesBodyOnError(t *testing.T) {
io.Reader io.Reader
io.Closer io.Closer
}{ }{
io.MultiReader(io.LimitReader(neverEnding('x'), 1<<20), plan9SleepReader{}, errorReader{fakeErr}), io.MultiReader(io.LimitReader(neverEnding('x'), 1<<20), errorReader{fakeErr}),
closerFunc(func() error { closerFunc(func() error {
select { select {
case didClose <- true: case didClose <- true: