From: Josh Bleecher Snyder <josharian@gmail.com>
Date: Mon, 21 Apr 2014 20:07:51 +0000 (-0700)
Subject: net: extend TestVariousDeadlines1Proc timeout
X-Git-Tag: go1.3beta1~2
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=9cddb60d251fbd3b5a391b87fa76c20378296f92;p=gostls13.git

net: extend TestVariousDeadlines1Proc timeout

TestVariousDeadlines1Proc was flaky on my system,
failing on about 5% of runs.

LGTM=bradfitz
R=golang-codereviews, bradfitz
CC=golang-codereviews
https://golang.org/cl/89830045
---

diff --git a/src/pkg/net/timeout_test.go b/src/pkg/net/timeout_test.go
index 40b5068087..2c56947b6e 100644
--- a/src/pkg/net/timeout_test.go
+++ b/src/pkg/net/timeout_test.go
@@ -494,10 +494,7 @@ func testVariousDeadlines(t *testing.T, maxProcs int) {
 				clientc <- copyRes{n, err, d}
 			}()
 
-			tooLong := 2 * time.Second
-			if runtime.GOOS == "windows" {
-				tooLong = 5 * time.Second
-			}
+			tooLong := 5 * time.Second
 			select {
 			case res := <-clientc:
 				if isTimeout(res.err) {