[release-branch.go1.8] net: increase expected time to dial a closed port on all Darwi...

All current darwin architectures seem to take at least 100ms to dial a closed port,
and that was making the all.bash script fail.

Fixes #22062

Change-Id: Ib79c4b7a5db2373c95ce5d993cdcbee55cc0667f
Reviewed-on: https://go-review.googlesource.com/67350
Reviewed-by: Ian Lance Taylor <iant@golang.org>

diff --git a/src/net/dial_test.go b/src/net/dial_test.go
index ea50fa5d67ce7659c76dd9605b8e316d8b785a28..e50ab961ce4e39afd1b60cba0b51909e981b08d5 100644 (file)
--- a/src/net/dial_test.go
+++ b/src/net/dial_test.go
@@ -225,7 +225,7 @@ func dialClosedPort() (actual, expected time.Duration) {
        // but other platforms should be instantaneous.
        if runtime.GOOS == "windows" {
                expected = 1500 * time.Millisecond
-       } else if runtime.GOOS == "darwin" && (runtime.GOARCH == "arm" || runtime.GOARCH == "arm64") {
+       } else if runtime.GOOS == "darwin" {
                expected = 150 * time.Millisecond
        } else {
                expected = 95 * time.Millisecond