From 9a78eadeb636689f79dbf6bd3c0a35d830678097 Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Fri, 11 Nov 2016 14:05:51 -0800 Subject: [PATCH] net: deflake TestTCPSupriousConnSetupCompletion [sic] And rename it. Fixes #17703 Change-Id: I73c82a9b3f96180699c6d33c069a666018eb30f9 Reviewed-on: https://go-review.googlesource.com/33149 Run-TryBot: Brad Fitzpatrick TryBot-Result: Gobot Gobot Reviewed-by: Ian Lance Taylor --- src/net/error_test.go | 3 ++- src/net/tcpsock_unix_test.go | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/net/error_test.go b/src/net/error_test.go index b8d317cbf0..a609aaa7ba 100644 --- a/src/net/error_test.go +++ b/src/net/error_test.go @@ -97,7 +97,8 @@ second: goto third } switch nestedErr { - case errCanceled, errClosing, errMissingAddress, errNoSuitableAddress: + case errCanceled, errClosing, errMissingAddress, errNoSuitableAddress, + context.DeadlineExceeded, context.Canceled: return nil } return fmt.Errorf("unexpected type on 2nd nested level: %T", nestedErr) diff --git a/src/net/tcpsock_unix_test.go b/src/net/tcpsock_unix_test.go index c07f7d7889..2375fe24dc 100644 --- a/src/net/tcpsock_unix_test.go +++ b/src/net/tcpsock_unix_test.go @@ -15,7 +15,7 @@ import ( ) // See golang.org/issue/14548. -func TestTCPSupriousConnSetupCompletion(t *testing.T) { +func TestTCPSpuriousConnSetupCompletion(t *testing.T) { if testing.Short() { t.Skip("skipping in short mode") } @@ -57,7 +57,7 @@ func TestTCPSupriousConnSetupCompletion(t *testing.T) { c, err := d.Dial(ln.Addr().Network(), ln.Addr().String()) if err != nil { if perr := parseDialError(err); perr != nil { - t.Errorf("#%d: %v", i, err) + t.Errorf("#%d: %v (original error: %v)", i, perr, err) } return } -- 2.50.0