diff options
| author | Tobias Klauser <tklauser@distanz.ch> | 2021-05-10 14:52:22 +0200 |
|---|---|---|
| committer | Tobias Klauser <tobias.klauser@gmail.com> | 2021-05-10 15:49:50 +0000 |
| commit | 82517acae866d60a9754d44d004bfa159e656c07 (patch) | |
| tree | 4cddd76f4b4ad0bef5d68554d993a59e271fa1a7 /src/net/dial_test.go | |
| parent | 031854117f91fbc1265840a04caf2a7a168dd06b (diff) | |
| download | go-82517acae866d60a9754d44d004bfa159e656c07.tar.gz go-82517acae866d60a9754d44d004bfa159e656c07.zip | |
net, runtime: drop macOS 10.12 skip conditions in tests
Go 1.17 requires macOS 10.13 or later. Thus, drop the special cases for
the darwin-amd64-10_12 builder added in CL 202618.
Updates #22019
Updates #23011
Updates #32919
Change-Id: Idef11c213dfb25fd002b7cda6d425cf2e26a2e06
Reviewed-on: https://go-review.googlesource.com/c/go/+/318329
Trust: Tobias Klauser <tobias.klauser@gmail.com>
Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-by: Bryan C. Mills <bcmills@google.com>
Diffstat (limited to 'src/net/dial_test.go')
| -rw-r--r-- | src/net/dial_test.go | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/net/dial_test.go b/src/net/dial_test.go index 394bdb047e..f899da10cf 100644 --- a/src/net/dial_test.go +++ b/src/net/dial_test.go @@ -656,15 +656,7 @@ func TestDialerLocalAddr(t *testing.T) { } c, err := d.Dial(tt.network, addr) if err == nil && tt.error != nil || err != nil && tt.error == nil { - // A suspected kernel bug in macOS 10.12 occasionally results in - // timeout errors when dialing address ::1. The errors have not - // been observed on newer versions of the OS, so we don't plan to work - // around them. See https://golang.org/issue/22019. - if tt.raddr == "::1" && os.Getenv("GO_BUILDER_NAME") == "darwin-amd64-10_12" && os.IsTimeout(err) { - t.Logf("ignoring timeout error on Darwin; see https://golang.org/issue/22019") - } else { - t.Errorf("%s %v->%s: got %v; want %v", tt.network, tt.laddr, tt.raddr, err, tt.error) - } + t.Errorf("%s %v->%s: got %v; want %v", tt.network, tt.laddr, tt.raddr, err, tt.error) } if err != nil { if perr := parseDialError(err); perr != nil { |