net/http: remove arbitrary timeout in TestServerAllowsBlockingRemoteAddr

If the test actually deadlocks, we probably want a goroutine dump to
debug it anyway. Otherwise, the arbitrary timeout can only cause
spurious failures.

Fixes #36179.

Change-Id: Ic2037496959a38d3231eefdbc1dd5d45eebdf306
Reviewed-on: https://go-review.googlesource.com/c/go/+/474582
Auto-Submit: Bryan Mills <bcmills@google.com>
Reviewed-by: Damien Neil <dneil@google.com>
Run-TryBot: Bryan Mills <bcmills@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>

diff --git a/src/net/http/serve_test.go b/src/net/http/serve_test.go
index b2bdeb10a1e9aeba1697c973ae5a52fd17307a53..343a358ef8c10bdd2d30990dae0f649a3c025127 100644 (file)
--- a/src/net/http/serve_test.go
+++ b/src/net/http/serve_test.go
@@ -1354,13 +1354,7 @@ func testServerAllowsBlockingRemoteAddr(t *testing.T, mode testMode) {
        // Start another request and grab its connection
        response2c := make(chan string, 1)
        go fetch(2, response2c)
-       var conn2 net.Conn
-
-       select {
-       case conn2 = <-conns:
-       case <-time.After(time.Second):
-               t.Fatal("Second Accept didn't happen")
-       }
+       conn2 := <-conns
 
        // Send a response on connection 2.
        conn2.(*blockingRemoteAddrConn).addrs <- &net.TCPAddr{