From: David du Colombier <0intro@gmail.com>
Date: Tue, 18 Oct 2016 13:28:44 +0000 (+0200)
Subject: net: enable TestCancelRequestWithChannelBeforeDo on Plan 9
X-Git-Tag: go1.8beta1~793
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=8a255cb85cf4a0b20d0f5dc513d3bb0c56518ec2;p=gostls13.git

net: enable TestCancelRequestWithChannelBeforeDo on Plan 9

This issue has been fixed in CL 31390.

Fixes #11476.

Change-Id: I6658bda2e494d3239d62c49d0bd5d34a36b744d0
Reviewed-on: https://go-review.googlesource.com/31394
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
---

diff --git a/src/net/http/transport_test.go b/src/net/http/transport_test.go
index 3051ec9473..1221642f2f 100644
--- a/src/net/http/transport_test.go
+++ b/src/net/http/transport_test.go
@@ -1696,12 +1696,6 @@ func testCancelRequestWithChannelBeforeDo(t *testing.T, withCtx bool) {
 	defer ts.Close()
 	defer close(unblockc)
 
-	// Don't interfere with the next test on plan9.
-	// Cf. https://golang.org/issues/11476
-	if runtime.GOOS == "plan9" {
-		defer time.Sleep(500 * time.Millisecond)
-	}
-
 	tr := &Transport{}
 	defer tr.CloseIdleConnections()
 	c := &Client{Transport: tr}