diff options
| author | Ian Lance Taylor <iant@golang.org> | 2019-11-06 13:47:19 -0800 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2019-11-07 05:52:34 +0000 |
| commit | 3eabdd291d3f53c88fdd01aca30158d0c06420b6 (patch) | |
| tree | bfb5c1a4f4c4f4fb52101305dde20f3ed2108a7e /src/net/dial_test.go | |
| parent | 198f0452b0292eb245bb5122510b1dfd0050dacc (diff) | |
| download | go-3eabdd291d3f53c88fdd01aca30158d0c06420b6.tar.gz go-3eabdd291d3f53c88fdd01aca30158d0c06420b6.zip | |
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>
Diffstat (limited to 'src/net/dial_test.go')
| -rw-r--r-- | src/net/dial_test.go | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/net/dial_test.go b/src/net/dial_test.go index 4569703d12..2eddac8284 100644 --- 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) } |