From: Russ Cox <rsc@golang.org>
Date: Wed, 6 Jan 2016 15:53:16 +0000 (-0500)
Subject: net: fix timeout test bug
X-Git-Tag: go1.6beta2~123
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=aec2f0cf855ac2d2b79ca3178dcd9f63c0b5afb0;p=gostls13.git

net: fix timeout test bug

This was supposed to be in CL 18205 but I submitted via the web
instead of from my computer, so it got lost.
May deflake some things.

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

diff --git a/src/net/timeout_test.go b/src/net/timeout_test.go
index 5832306591..98e3164fb9 100644
--- a/src/net/timeout_test.go
+++ b/src/net/timeout_test.go
@@ -996,7 +996,6 @@ func TestReadWriteDeadlineRace(t *testing.T) {
 	if testing.Short() {
 		N = 50
 	}
-	defer runtime.GOMAXPROCS(runtime.GOMAXPROCS(4))
 
 	ln, err := newLocalListener("tcp")
 	if err != nil {