Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

net, runtime: drop macOS 10.12 skip conditions in tests

Browse source 
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>
This commit is contained in:
Tobias Klauser 2021-05-10 14:52:22 +02:00 • committed by Tobias Klauser
parent 031854117f
commit 82517acae8
3 changed files with 1 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/net/dial_test.go
View file

@ -656,16 +656,8 @@ func TestDialerLocalAddr(t *testing.T) {
} }
c, err := d.Dial(tt.network, addr) c, err := d.Dial(tt.network, addr)
if err == nil && tt.error != nil || err != nil && tt.error == nil { 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 err != nil {
if perr := parseDialError(err); perr != nil { if perr := parseDialError(err); perr != nil {
t.Error(perr) t.Error(perr)

7
src/net/server_test.go
View file

@ -105,13 +105,6 @@ func TestTCPServer(t *testing.T) {
if perr := parseDialError(err); perr != nil { if perr := parseDialError(err); perr != nil {
t.Error(perr) t.Error(perr)
} }
if tt.taddr == "::1" && os.Getenv("GO_BUILDER_NAME") == "darwin-amd64-10_12" && os.IsTimeout(err) {
// A suspected kernel bug in macOS 10.12 occasionally results in
// "i/o 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/32919.
t.Skipf("skipping due to error on known-flaky macOS 10.12 builder: %v", err)
}
t.Fatal(err) t.Fatal(err)
} }
defer c.Close() defer c.Close()

8
src/runtime/crash_test.go
View file

@ -470,14 +470,6 @@ func TestRecoverBeforePanicAfterGoexit2(t *testing.T) {
} }
func TestNetpollDeadlock(t *testing.T) { func TestNetpollDeadlock(t *testing.T) {
if os.Getenv("GO_BUILDER_NAME") == "darwin-amd64-10_12" {
// A suspected kernel bug in macOS 10.12 occasionally results in
// an apparent deadlock when dialing localhost. 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.
testenv.SkipFlaky(t, 22019)
}
t.Parallel() t.Parallel()
output := runTestProg(t, "testprognet", "NetpollDeadlock") output := runTestProg(t, "testprognet", "NetpollDeadlock")
want := "done\n" want := "done\n"