mirror of
https://github.com/golang/go
synced 2024-11-02 09:28:34 +00:00
net/http: prevent infinite wait during TestMissingStatusNoPanic
If the client request never makes it to the server, the outstanding accept is never broken. Change the test to always close the listening socket when the client request completes. Updates #45358 Change-Id: I744a91dfa11704e7e528163d7669c394e90456dc Reviewed-on: https://go-review.googlesource.com/c/go/+/319275 Trust: Heschi Kreinick <heschi@google.com> Reviewed-by: Bryan C. Mills <bcmills@google.com>
This commit is contained in:
parent
0eb38f2b16
commit
3d324f127d
1 changed files with 2 additions and 6 deletions
|
@ -5322,7 +5322,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" +
|
||||
|
@ -5334,10 +5333,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 {
|
||||
|
@ -5368,7 +5364,7 @@ func TestMissingStatusNoPanic(t *testing.T) {
|
|||
t.Errorf("got=%v want=%q", err, want)
|
||||
}
|
||||
|
||||
close(shutdown)
|
||||
ln.Close()
|
||||
<-done
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue