net: deflake TestTCPSupriousConnSetupCompletion [sic]

And rename it.

Fixes #17703

Change-Id: I73c82a9b3f96180699c6d33c069a666018eb30f9
Reviewed-on: https://go-review.googlesource.com/33149
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>

diff --git a/src/net/error_test.go b/src/net/error_test.go
index b8d317cbf08008397e91d0a3338cf6766f9f4dba..a609aaa7baf9a65ad0fcc6e6446b1608cefa335d 100644 (file)
--- 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 c07f7d7889b11ebfacdd225fb8f59320066bf7ba..2375fe24dc48870767ca8f0e5781f496f1098be9 100644 (file)
--- 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
                        }