From 6e668267ac89a07fdf9aa9ca0d19a4a9f3077c4b Mon Sep 17 00:00:00 2001 From: "Bryan C. Mills" Date: Fri, 27 Mar 2020 17:16:26 -0400 Subject: [PATCH] net/http: remove another arbitrary timeout in TestTLSHandshakeTimeout Updates #37327 Change-Id: I87774be71ed54e9c45a27062122e6177888e890a Reviewed-on: https://go-review.googlesource.com/c/go/+/226137 Auto-Submit: Bryan Mills TryBot-Result: Gopher Robot Run-TryBot: Bryan Mills Reviewed-by: Damien Neil --- src/net/http/serve_test.go | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/net/http/serve_test.go b/src/net/http/serve_test.go index eac527b94f..e11de66077 100644 --- a/src/net/http/serve_test.go +++ b/src/net/http/serve_test.go @@ -1444,13 +1444,9 @@ func testTLSHandshakeTimeout(t *testing.T, mode testMode) { t.Errorf("Read = %d, %v; want an error and no bytes", n, err) } - select { - case v := <-errc: - if !strings.Contains(v, "timeout") && !strings.Contains(v, "TLS handshake") { - t.Errorf("expected a TLS handshake timeout error; got %q", v) - } - case <-time.After(5 * time.Second): - t.Errorf("timeout waiting for logged error") + v := <-errc + if !strings.Contains(v, "timeout") && !strings.Contains(v, "TLS handshake") { + t.Errorf("expected a TLS handshake timeout error; got %q", v) } } -- 2.50.0