diff options
| author | Russ Cox <rsc@golang.org> | 2020-10-16 13:39:50 -0400 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2020-10-16 19:04:24 +0000 |
| commit | ae162554f9e0078b325fb32e2e10ddda15b2acdc (patch) | |
| tree | e49e8c0f276f929e4ecd0a8756e8ac745b710dcf /src/net/http | |
| parent | 570b49d6fc8d66e5bcb7645dfe2a3f9a118dbf0f (diff) | |
| download | go-ae162554f9e0078b325fb32e2e10ddda15b2acdc.tar.xz | |
net/http: try to deflake TestTransportDiscardsUnneededConns
Fixes #33585.
Fixes #36797.
Change-Id: I9202b624642368089a9ce827e3e7a7427100bf4f
Reviewed-on: https://go-review.googlesource.com/c/go/+/263144
Trust: Russ Cox <rsc@golang.org>
Trust: Benny Siegert <bsiegert@gmail.com>
Run-TryBot: Russ Cox <rsc@golang.org>
Reviewed-by: Benny Siegert <bsiegert@gmail.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
TryBot-Result: Go Bot <gobot@golang.org>
Diffstat (limited to 'src/net/http')
| -rw-r--r-- | src/net/http/clientserver_test.go | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/net/http/clientserver_test.go b/src/net/http/clientserver_test.go index def5c424f0..439818bb2f 100644 --- a/src/net/http/clientserver_test.go +++ b/src/net/http/clientserver_test.go @@ -1009,8 +1009,14 @@ func TestTransportDiscardsUnneededConns(t *testing.T) { defer wg.Done() resp, err := c.Get(cst.ts.URL) if err != nil { - t.Errorf("Get: %v", err) - return + // Try to work around spurious connection reset on loaded system. + // See golang.org/issue/33585 and golang.org/issue/36797. + time.Sleep(10 * time.Millisecond) + resp, err = c.Get(cst.ts.URL) + if err != nil { + t.Errorf("Get: %v", err) + return + } } defer resp.Body.Close() slurp, err := ioutil.ReadAll(resp.Body) |