aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@golang.org>2016-11-08 17:44:53 +0000
committerBrad Fitzpatrick <bradfitz@golang.org>2016-11-08 18:07:17 +0000
commit27a3d30dd09cdd869b1b67f0154fa698bdf8ead2 (patch)
tree3b64f7cb4b4510d58d5a4a7b92582613348b0ff8
parent41eb9bb993b22979eebffe4eaeeca53db8e7b388 (diff)
downloadgo-27a3d30dd09cdd869b1b67f0154fa698bdf8ead2.tar.gz
go-27a3d30dd09cdd869b1b67f0154fa698bdf8ead2.zip
net/http: deflake TestClientRedirects
Fix another case of a parallel test relying on a global variable (DefaultTransport) implicitly. Use the private Transport already in scope instead. It's closed at the end, instead of randomly via another test. Change-Id: I95e51926177ad19a766cabbb306782ded1bbb59b Reviewed-on: https://go-review.googlesource.com/32913 Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Ian Lance Taylor <iant@golang.org>
-rw-r--r--src/net/http/client_test.go13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/net/http/client_test.go b/src/net/http/client_test.go
index ba5602245b..2fe6e2164f 100644
--- a/src/net/http/client_test.go
+++ b/src/net/http/client_test.go
@@ -251,11 +251,14 @@ func TestClientRedirects(t *testing.T) {
var checkErr error
var lastVia []*Request
var lastReq *Request
- c = &Client{CheckRedirect: func(req *Request, via []*Request) error {
- lastReq = req
- lastVia = via
- return checkErr
- }}
+ c = &Client{
+ Transport: tr,
+ CheckRedirect: func(req *Request, via []*Request) error {
+ lastReq = req
+ lastVia = via
+ return checkErr
+ },
+ }
res, err := c.Get(ts.URL)
if err != nil {
t.Fatalf("Get error: %v", err)