]> Cypherpunks.ru repositories - gostls13.git/commitdiff
net/http: deflake TestClientRedirects
authorBrad Fitzpatrick <bradfitz@golang.org>
Tue, 8 Nov 2016 17:44:53 +0000 (17:44 +0000)
committerBrad Fitzpatrick <bradfitz@golang.org>
Tue, 8 Nov 2016 18:07:17 +0000 (18:07 +0000)
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>
src/net/http/client_test.go

index ba5602245b825be0e35e418f8bfe9da92dcbba75..2fe6e2164fcf3bdb41150e270908440cd7754528 100644 (file)
@@ -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)