aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2020-10-12 21:09:18 -0400
committerRuss Cox <rsc@golang.org>2020-10-16 00:59:55 +0000
commit59202c4204205ee019cf25efcb814b72c8703f4b (patch)
treea9276b945b5cebbbba392c828d22a5b80dcdeef3 /src
parent7602d4119663b234f655e3bb282b7127a048a5cd (diff)
downloadgo-59202c4204205ee019cf25efcb814b72c8703f4b.tar.xz
net/http: deflake TestServerEmptyBodyRace_h1, or at least try
Fixes #22540. For #33585. Change-Id: I504b5a91ce1a39cd4ffd2380178a1b8f82f49dd3 Reviewed-on: https://go-review.googlesource.com/c/go/+/261698 Trust: Russ Cox <rsc@golang.org> Run-TryBot: Russ Cox <rsc@golang.org> TryBot-Result: Go Bot <gobot@golang.org> Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
Diffstat (limited to 'src')
-rw-r--r--src/net/http/serve_test.go10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/net/http/serve_test.go b/src/net/http/serve_test.go
index cbd3101f27..d84804c2e9 100644
--- a/src/net/http/serve_test.go
+++ b/src/net/http/serve_test.go
@@ -4275,8 +4275,14 @@ func testServerEmptyBodyRace(t *testing.T, h2 bool) {
defer wg.Done()
res, err := cst.c.Get(cst.ts.URL)
if err != nil {
- t.Error(err)
- return
+ // Try to deflake spurious "connection reset by peer" under load.
+ // See golang.org/issue/22540.
+ time.Sleep(10 * time.Millisecond)
+ res, err = cst.c.Get(cst.ts.URL)
+ if err != nil {
+ t.Error(err)
+ return
+ }
}
defer res.Body.Close()
_, err = io.Copy(ioutil.Discard, res.Body)