diff options
| author | Katie Hockman <katie@golang.org> | 2021-06-07 12:31:32 -0400 |
|---|---|---|
| committer | Katie Hockman <katie@golang.org> | 2021-06-07 12:31:32 -0400 |
| commit | 9647f89f2ac2a64acb502c594fc747f206842a86 (patch) | |
| tree | e48b92008454a8aa6ffd1f4709578ac5b921a6a4 /src/net/http/transport_test.go | |
| parent | 03a15201e7e0f11c8f4021a181071040a04dc375 (diff) | |
| parent | ab7f8297f9734b24a43a942930258cda411f16a3 (diff) | |
| download | go-9647f89f2ac2a64acb502c594fc747f206842a86.tar.gz go-9647f89f2ac2a64acb502c594fc747f206842a86.zip | |
[dev.boringcrypto.go1.15] all: merge go1.15.13 into dev.boringcrypto.go1.15
Change-Id: I90b28aa5938fe0bddf11201c6bdb851de5c654c3
Diffstat (limited to 'src/net/http/transport_test.go')
| -rw-r--r-- | src/net/http/transport_test.go | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/net/http/transport_test.go b/src/net/http/transport_test.go index 3c7b9eb4de8..faa77e9ccd2 100644 --- a/src/net/http/transport_test.go +++ b/src/net/http/transport_test.go @@ -5270,7 +5270,6 @@ func TestMissingStatusNoPanic(t *testing.T) { ln := newLocalListener(t) addr := ln.Addr().String() - shutdown := make(chan bool, 1) done := make(chan bool) fullAddrURL := fmt.Sprintf("http://%s", addr) raw := "HTTP/1.1 400\r\n" + @@ -5282,10 +5281,7 @@ func TestMissingStatusNoPanic(t *testing.T) { "Aloha Olaa" go func() { - defer func() { - ln.Close() - close(done) - }() + defer close(done) conn, _ := ln.Accept() if conn != nil { @@ -5316,7 +5312,7 @@ func TestMissingStatusNoPanic(t *testing.T) { t.Errorf("got=%v want=%q", err, want) } - close(shutdown) + ln.Close() <-done } |