diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/net/http/client_test.go | 1 | ||||
| -rw-r--r-- | src/net/http/transport_test.go | 10 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/net/http/client_test.go b/src/net/http/client_test.go index d184f72031..9952ed52c6 100644 --- a/src/net/http/client_test.go +++ b/src/net/http/client_test.go @@ -438,7 +438,6 @@ func testRedirectsByMethod(t *testing.T, mode testMode, method string, table []r req, _ := NewRequest(method, ts.URL+tt.suffix, strings.NewReader(content)) req.GetBody = func() (io.ReadCloser, error) { return io.NopCloser(strings.NewReader(content)), nil } res, err := c.Do(req) - if err != nil { t.Fatal(err) } diff --git a/src/net/http/transport_test.go b/src/net/http/transport_test.go index 37e6cbb8e3..799384e5ac 100644 --- a/src/net/http/transport_test.go +++ b/src/net/http/transport_test.go @@ -3877,7 +3877,7 @@ func testTransportNoReuseAfterEarlyResponse(t *testing.T, mode testMode) { c net.Conn } var getOkay bool - var copying sync.WaitGroup + var willCopy sync.WaitGroup closeConn := func() { sconn.Lock() defer sconn.Unlock() @@ -3891,7 +3891,7 @@ func testTransportNoReuseAfterEarlyResponse(t *testing.T, mode testMode) { } defer func() { closeConn() - copying.Wait() + willCopy.Wait() }() ts := newClientServerTest(t, mode, HandlerFunc(func(w ResponseWriter, r *Request) { @@ -3903,12 +3903,12 @@ func testTransportNoReuseAfterEarlyResponse(t *testing.T, mode testMode) { sconn.Lock() sconn.c = conn sconn.Unlock() - conn.Write([]byte("HTTP/1.1 200 OK\r\nContent-Length: 3\r\n\r\nfoo")) // keep-alive - copying.Add(1) + willCopy.Add(1) + conn.Write([]byte("HTTP/1.1 200 OK\r\nContent-Length: 3\r\n\r\nfoo")) // keep-alive go func() { io.Copy(io.Discard, conn) - copying.Done() + willCopy.Done() }() })).ts c := ts.Client() |