net: skip TestDialCancel if Dial fails with "connection refused"

Fixes #15191

Change-Id: I86214ede619400acd44f21138b5ddf6cef4649a3
Reviewed-on: https://go-review.googlesource.com/c/go/+/205698
Run-TryBot: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>

diff --git a/src/net/dial_test.go b/src/net/dial_test.go
index 4569703d129483ab969b403e3fd1c82442dbb40c..2eddac8284b50bb97eac6e50ae33621362fa5c42 100644 (file)
--- a/src/net/dial_test.go
+++ b/src/net/dial_test.go
@@ -14,6 +14,7 @@ import (
        "io"
        "os"
        "runtime"
+       "strings"
        "sync"
        "testing"
        "time"
@@ -759,10 +760,6 @@ func TestDialerKeepAlive(t *testing.T) {
 }
 
 func TestDialCancel(t *testing.T) {
-       switch testenv.Builder() {
-       case "linux-arm64-buildlet":
-               t.Skip("skipping on linux-arm64-buildlet; incompatible network config? issue 15191")
-       }
        mustHaveExternalNetwork(t)
 
        blackholeIPPort := JoinHostPort(slowDst4, "1234")
@@ -807,6 +804,11 @@ func TestDialCancel(t *testing.T) {
                                t.Error(perr)
                        }
                        if ticks < cancelTick {
+                               // Using strings.Contains is ugly but
+                               // may work on plan9 and windows.
+                               if strings.Contains(err.Error(), "connection refused") {
+                                       t.Skipf("connection to %v failed fast with %v", blackholeIPPort, err)
+                               }
                                t.Fatalf("dial error after %d ticks (%d before cancel sent): %v",
                                        ticks, cancelTick-ticks, err)
                        }