From: Russ Cox <rsc@golang.org>
Date: Fri, 16 Oct 2020 17:39:50 +0000 (-0400)
Subject: net/http: try to deflake TestTransportDiscardsUnneededConns
X-Git-Tag: go1.16beta1~701
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=ae162554f9e0078b325fb32e2e10ddda15b2acdc;p=gostls13.git

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>
---

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)