Skip to content

Commit

Permalink
net/http: prevent infinite wait during TestMissingStatusNoPanic
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
fraenkel authored and neild committed May 14, 2021
1 parent 0eb38f2 commit 3d324f1
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions src/net/http/transport_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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" +
Expand All @@ -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 {
Expand Down Expand Up @@ -5368,7 +5364,7 @@ func TestMissingStatusNoPanic(t *testing.T) {
t.Errorf("got=%v want=%q", err, want)
}

close(shutdown)
ln.Close()
<-done
}

Expand Down

0 comments on commit 3d324f1

Please sign in to comment.