aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAuthor Name <brett.j.merrill94@gmail.com>2017-09-30 13:47:48 -0700
committerRuss Cox <rsc@golang.org>2017-10-25 20:23:19 +0000
commit7dadd8d5172d44a7a9eccf4770ea299d7ef37b14 (patch)
tree041c0ceb1b2358f3775a8c78e406be1e3abc74dd
parentd80889341c7ce6f2cfdd0a9d2e0feb20c4805bbc (diff)
downloadgo-7dadd8d5172d44a7a9eccf4770ea299d7ef37b14.tar.gz
go-7dadd8d5172d44a7a9eccf4770ea299d7ef37b14.zip
[release-branch.go1.9] net: increase expected time to dial a closed port on all Darwin ports
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> Reviewed-on: https://go-review.googlesource.com/70988 Run-TryBot: Russ Cox <rsc@golang.org> TryBot-Result: Gobot Gobot <gobot@golang.org>
-rw-r--r--src/net/dial_test.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/net/dial_test.go b/src/net/dial_test.go
index eba817e706..13fa9faacb 100644
--- a/src/net/dial_test.go
+++ b/src/net/dial_test.go
@@ -161,7 +161,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