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>

diff --git a/src/net/dial_test.go b/src/net/dial_test.go
index 394bdb047e7fffc8c6bcefde09a6cec66f15c32b..f899da10cf8023cbaedf72a842eb8baa8bb6e616 100644 (file)
--- 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 {

diff --git a/src/net/server_test.go b/src/net/server_test.go
index 8d4db7233d128833a1ae02313a8ffed325c8b3e7..7cbf15229887155f05ac91092e3e4d079fa961bd 100644 (file)
--- a/src/net/server_test.go
+++ b/src/net/server_test.go
@@ -105,13 +105,6 @@ func TestTCPServer(t *testing.T) {
                                        if perr := parseDialError(err); perr != nil {
                                                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)
                                }
                                defer c.Close()

diff --git a/src/runtime/crash_test.go b/src/runtime/crash_test.go
index e5bd7973b70b781771b40eb734a49e0de7a0d4d6..e0c0bac8926adc2bd5465fb8fdcb64b53dac441d 100644 (file)
--- a/src/runtime/crash_test.go
+++ b/src/runtime/crash_test.go
@@ -470,14 +470,6 @@ func TestRecoverBeforePanicAfterGoexit2(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()
        output := runTestProg(t, "testprognet", "NetpollDeadlock")
        want := "done\n"