From 8c5dbba01c9e661ca33a0cb1783c10c71d34da8d Mon Sep 17 00:00:00 2001 From: "Bryan C. Mills" Date: Tue, 12 Nov 2019 12:10:03 -0500 Subject: [PATCH] crypto/tls: retry ETIMEDOUT flakes in localPipe on dragonfly Fixes #29583 Change-Id: Ia89433bddd4c9f67ec1f0150b730cde8a7e973ee Reviewed-on: https://go-review.googlesource.com/c/go/+/206759 Run-TryBot: Bryan C. Mills Reviewed-by: Brad Fitzpatrick TryBot-Result: Gobot Gobot --- src/crypto/tls/handshake_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/crypto/tls/handshake_test.go b/src/crypto/tls/handshake_test.go index baf8adb16d..f55cd16ca8 100644 --- a/src/crypto/tls/handshake_test.go +++ b/src/crypto/tls/handshake_test.go @@ -275,9 +275,9 @@ Dialing: var c1 net.Conn c1, err = net.Dial(addr.Network(), addr.String()) if err != nil { - if runtime.GOOS == "dragonfly" && isConnRefused(err) { - // golang.org/issue/29583: Dragonfly sometimes returned a spurious - // ECONNREFUSED. + if runtime.GOOS == "dragonfly" && (isConnRefused(err) || os.IsTimeout(err)) { + // golang.org/issue/29583: Dragonfly sometimes returns a spurious + // ECONNREFUSED or ETIMEDOUT. <-tooSlow.C continue } -- 2.50.0