From d6fa0d2ef3fc29c38af2675d395a089cc73af996 Mon Sep 17 00:00:00 2001 From: "Bryan C. Mills" Date: Wed, 8 Mar 2023 17:10:06 -0500 Subject: [PATCH] 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 Reviewed-by: Damien Neil Run-TryBot: Bryan Mills TryBot-Result: Gopher Robot --- src/net/http/serve_test.go | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/net/http/serve_test.go b/src/net/http/serve_test.go index b2bdeb10a1..343a358ef8 100644 --- 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{ -- 2.50.0