]> Cypherpunks repositories - gostls13.git/commit
net/http: deflake TestServerShutdownStateNew
authorDaniel Martí <mvdan@mvdan.cc>
Thu, 5 Jul 2018 16:46:51 +0000 (17:46 +0100)
committerBrad Fitzpatrick <bradfitz@golang.org>
Fri, 6 Jul 2018 02:13:27 +0000 (02:13 +0000)
commit96186a58e3ceb6bc3703f9dae0c37e2118a01b0d
tree86abdd7f6561c66c19699dad0536acb25d2b9202
parentefea01788d5d8b14426e31698ca30f27365c0670
net/http: deflake TestServerShutdownStateNew

This function tests that calling Shutdown on a Server that has a "new"
connection yet to write any bytes, in which case it should wait for five
seconds until considering the connection as "idle".

However, the test was flaky. If Shutdown happened to run before the
server accepted the connection, the connection would immediately be
rejected as the server is already closed, as opposed to being accepted
in the "new" state. Then, Shutdown would return almost immediately, as
it had no connections to wait for:

--- FAIL: TestServerShutdownStateNew (2.00s)
    serve_test.go:5603: shutdown too soon after 49.41µs
    serve_test.go:5617: timeout waiting for Read to unblock

Fix this by making sure that the connection has been accepted before
calling Shutdown. Verified that the flake is gone after 50k concurrent
runs of the test with no failures, whereas the test used to fail around
10% of the time on my laptop:

go test -c && stress -p 256 ./http.test -test.run TestServerShutdownStateNew

Fixes #26233.

Change-Id: I819d7eedb67c48839313427675facb39d9c17257
Reviewed-on: https://go-review.googlesource.com/122355
Run-TryBot: Daniel Martí <mvdan@mvdan.cc>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
src/net/http/serve_test.go