diff options
| author | Damien Neil <dneil@google.com> | 2023-04-18 14:53:02 -0700 |
|---|---|---|
| committer | Gopher Robot <gobot@golang.org> | 2024-03-21 00:10:51 +0000 |
| commit | 7d4d71e52f0714c7990705f0fc56f9104761514e (patch) | |
| tree | 7051b1767bdfb7b64e4d51c5ad6c88bc8eb8486e /src/net/http | |
| parent | a245aced26a5dde971e6a47dd045a01eadf19f1b (diff) | |
| download | go-7d4d71e52f0714c7990705f0fc56f9104761514e.tar.xz | |
net/http: improve error reporting in TestCancelRequestWhenSharingConnection
Ensure that errors are reported if an HTTP request unexpectedly fails.
For #56587
Change-Id: I1adfb4fedc24d4177caf54e34c5033267e32caa6
Reviewed-on: https://go-review.googlesource.com/c/go/+/486075
Reviewed-by: Bryan Mills <bcmills@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Auto-Submit: Damien Neil <dneil@google.com>
Reviewed-by: Emmanuel Odeke <emmanuel@orijtech.com>
Diffstat (limited to 'src/net/http')
| -rw-r--r-- | src/net/http/transport_test.go | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/net/http/transport_test.go b/src/net/http/transport_test.go index 204133f130..744bbf1ad1 100644 --- a/src/net/http/transport_test.go +++ b/src/net/http/transport_test.go @@ -6844,23 +6844,25 @@ func testCancelRequestWhenSharingConnection(t *testing.T, mode testMode) { }) req, _ := NewRequestWithContext(ctx, "GET", ts.URL, nil) res, err := client.Do(req) - reqerrc <- err - if err == nil { + if err != nil { + reqerrc <- err + } else { res.Body.Close() } }() // Wait for the first request to receive a response and return the // connection to the idle pool. - r1c := <-reqc - close(r1c) + select { + case err := <-reqerrc: + t.Fatalf("request 1: got err %v, want nil", err) + case r1c := <-reqc: + close(r1c) + } var idlec chan struct{} select { case err := <-reqerrc: - if err != nil { - t.Fatalf("request 1: got err %v, want nil", err) - } - idlec = <-putidlec + t.Fatalf("request 1: got err %v, want nil", err) case idlec = <-putidlec: } |