Skip to content

Commit 4a381e3

Browse files
0introbradfitz
authored andcommitted
net/http: enable timeout tests on Plan 9
Deadlines have been implemented on Plan 9 in CL 31521. Enable the following tests: - TestServerTimeouts - TestOnlyWriteTimeout - TestTLSHandshakeTimeout - TestIssue4191_InfiniteGetTimeout - TestIssue4191_InfiniteGetToPutTimeout Updates #7237. Change-Id: If5e75cfaa9133dcf9ce6aac9fc2badafc1612b64 Reviewed-on: https://go-review.googlesource.com/33197 Run-TryBot: David du Colombier <[email protected]> TryBot-Result: Gobot Gobot <[email protected]> Reviewed-by: Brad Fitzpatrick <[email protected]>
1 parent 8d3d23a commit 4a381e3

File tree

2 files changed

+0
-15
lines changed

2 files changed

+0
-15
lines changed

src/net/http/serve_test.go

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -461,9 +461,6 @@ func TestMuxRedirectLeadingSlashes(t *testing.T) {
461461
}
462462

463463
func TestServerTimeouts(t *testing.T) {
464-
if runtime.GOOS == "plan9" {
465-
t.Skip("skipping test; see https://golang.org/issue/7237")
466-
}
467464
setParallel(t)
468465
defer afterTest(t)
469466
reqNum := 0
@@ -542,9 +539,6 @@ func TestServerTimeouts(t *testing.T) {
542539
// request) that will never happen.
543540
func TestOnlyWriteTimeout(t *testing.T) {
544541
setParallel(t)
545-
if runtime.GOOS == "plan9" {
546-
t.Skip("skipping test; see https://golang.org/issue/7237")
547-
}
548542
defer afterTest(t)
549543
var conn net.Conn
550544
var afterTimeoutErrc = make(chan error, 1)
@@ -1035,9 +1029,6 @@ func testHeadResponses(t *testing.T, h2 bool) {
10351029
}
10361030

10371031
func TestTLSHandshakeTimeout(t *testing.T) {
1038-
if runtime.GOOS == "plan9" {
1039-
t.Skip("skipping test; see https://golang.org/issue/7237")
1040-
}
10411032
setParallel(t)
10421033
defer afterTest(t)
10431034
ts := httptest.NewUnstartedServer(HandlerFunc(func(w ResponseWriter, r *Request) {}))

src/net/http/transport_test.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1352,9 +1352,6 @@ func TestTransportConcurrency(t *testing.T) {
13521352

13531353
func TestIssue4191_InfiniteGetTimeout(t *testing.T) {
13541354
setParallel(t)
1355-
if runtime.GOOS == "plan9" {
1356-
t.Skip("skipping test; see https://golang.org/issue/7237")
1357-
}
13581355
defer afterTest(t)
13591356
const debug = false
13601357
mux := NewServeMux()
@@ -1417,9 +1414,6 @@ func TestIssue4191_InfiniteGetTimeout(t *testing.T) {
14171414

14181415
func TestIssue4191_InfiniteGetToPutTimeout(t *testing.T) {
14191416
setParallel(t)
1420-
if runtime.GOOS == "plan9" {
1421-
t.Skip("skipping test; see https://golang.org/issue/7237")
1422-
}
14231417
defer afterTest(t)
14241418
const debug = false
14251419
mux := NewServeMux()

0 commit comments

Comments
 (0)