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

net/http: buffer the testConn close channel in TestHandlerFinishSkipBigContentLengthRead

Browse Source 
Previously the test used an unbuffered channel, but testConn.Close
sends to it with a select-with-default, so the send would be dropped
if the test goroutine happened not to have parked on the receive yet.

To make this kind of bug less likely in future tests, use a
newTestConn helper function instead of constructing testConn channel
literals in each test individually.

Fixes #62622.

Change-Id: I016cd0a89cf8a2a748ed57a4cdbd01a178f04dab
Reviewed-on: https://go-review.googlesource.com/c/go/+/529475
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Auto-Submit: Bryan Mills <bcmills@google.com>
Reviewed-by: Damien Neil <dneil@google.com>
This commit is contained in:
Bryan C. Mills 2023-09-19 10:37:28 -04:00 committed by Gopher Robot
parent 203c69a6ef
commit 3c4f12a7d6
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/net/http/serve_test.go
View File

@ -107,10 +107,14 @@ type testConn struct {
readMu sync.Mutex // for TestHandlerBodyClose readMu sync.Mutex // for TestHandlerBodyClose
readBuf bytes.Buffer readBuf bytes.Buffer
writeBuf bytes.Buffer writeBuf bytes.Buffer
closec chan bool // if non-nil, send value to it on close closec chan bool // 1-buffered; receives true when Close is called
noopConn noopConn
} }
func newTestConn() *testConn {
return &testConn{closec: make(chan bool, 1)}
}
func (c *testConn) Read(b []byte) (int, error) { func (c *testConn) Read(b []byte) (int, error) {
c.readMu.Lock() c.readMu.Lock()
defer c.readMu.Unlock() defer c.readMu.Unlock()
@ -4589,10 +4593,10 @@ Host: foo
} }
// If a Handler finishes and there's an unread request body, // If a Handler finishes and there's an unread request body,
// verify the server try to do implicit read on it before replying. // verify the server implicitly tries to do a read on it before replying.
func TestHandlerFinishSkipBigContentLengthRead(t *testing.T) { func TestHandlerFinishSkipBigContentLengthRead(t *testing.T) {
setParallel(t) setParallel(t)
conn := &testConn{closec: make(chan bool)} conn := newTestConn()
conn.readBuf.Write([]byte(fmt.Sprintf( conn.readBuf.Write([]byte(fmt.Sprintf(
"POST / HTTP/1.1\r\n" + "POST / HTTP/1.1\r\n" +
"Host: test\r\n" + "Host: test\r\n" +
@ -4682,7 +4686,7 @@ func TestServerValidatesHostHeader(t *testing.T) {
{"GET / HTTP/3.0", "", 505}, {"GET / HTTP/3.0", "", 505},
} }
for _, tt := range tests { for _, tt := range tests {
conn := &testConn{closec: make(chan bool, 1)} conn := newTestConn()
methodTarget := "GET / " methodTarget := "GET / "
if !strings.HasPrefix(tt.proto, "HTTP/") { if !strings.HasPrefix(tt.proto, "HTTP/") {
methodTarget = "" methodTarget = ""
@ -4780,7 +4784,7 @@ func TestServerValidatesHeaders(t *testing.T) {
{"foo: foo\xfffoo\r\n", 200}, // non-ASCII high octets in value are fine {"foo: foo\xfffoo\r\n", 200}, // non-ASCII high octets in value are fine
} }
for _, tt := range tests { for _, tt := range tests {
conn := &testConn{closec: make(chan bool, 1)} conn := newTestConn()
io.WriteString(&conn.readBuf, "GET / HTTP/1.1\r\nHost: foo\r\n"+tt.header+"\r\n") io.WriteString(&conn.readBuf, "GET / HTTP/1.1\r\nHost: foo\r\n"+tt.header+"\r\n")
ln := &oneConnListener{conn} ln := &oneConnListener{conn}
@ -5166,11 +5170,7 @@ Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.3
`) `)
res := []byte("Hello world!\n") res := []byte("Hello world!\n")
conn := &testConn{ conn := newTestConn()
// testConn.Close will not push into the channel
// if it's full.
closec: make(chan bool, 1),
}
handler := HandlerFunc(func(rw ResponseWriter, r *Request) { handler := HandlerFunc(func(rw ResponseWriter, r *Request) {
rw.Header().Set("Content-Type", "text/html; charset=utf-8") rw.Header().Set("Content-Type", "text/html; charset=utf-8")
rw.Write(res) rw.Write(res)
@ -5991,7 +5991,7 @@ func TestServerValidatesMethod(t *testing.T) {
{"GE(T", 400}, {"GE(T", 400},
} }
for _, tt := range tests { for _, tt := range tests {
conn := &testConn{closec: make(chan bool, 1)} conn := newTestConn()
io.WriteString(&conn.readBuf, tt.method+" / HTTP/1.1\r\nHost: foo.example\r\n\r\n") io.WriteString(&conn.readBuf, tt.method+" / HTTP/1.1\r\nHost: foo.example\r\n\r\n")
ln := &oneConnListener{conn} ln := &oneConnListener{conn}