]> Cypherpunks repositories - gostls13.git/commitdiff
[release-branch.go1.9] net: increase expected time to dial a closed port on all Darwi...
authorAuthor Name <brett.j.merrill94@gmail.com>
Sat, 30 Sep 2017 20:47:48 +0000 (13:47 -0700)
committerRuss Cox <rsc@golang.org>
Wed, 25 Oct 2017 20:23:19 +0000 (20:23 +0000)
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>

src/net/dial_test.go

index eba817e706120e7fe04ef58297335d409742d127..13fa9faacb56e4f56205de12d0c5ea570c872e01 100644 (file)
@@ -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