From: Josh Bleecher Snyder <josharian@gmail.com>
Date: Tue, 12 Apr 2016 21:04:01 +0000 (-0700)
Subject: net: make two tests not parallel
X-Git-Tag: go1.7beta1~731
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=6fb8bf9d7940b2e2a90249e1894ad4e3d24fd3e7;p=gostls13.git

net: make two tests not parallel

Running

stress -p 1 go test -short std

on a heavily loaded machine causes net timeouts
every 15 or 20 runs.
Making these tests not run in parallel helps.
With this change, I haven’t seen a single failure
in over 100 runs.

Fixes #14986

Change-Id: Ibaa14869ce8d95b00266aee94d62d195927ede68
Reviewed-on: https://go-review.googlesource.com/21905
Run-TryBot: Josh Bleecher Snyder <josharian@gmail.com>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
---

diff --git a/src/net/timeout_test.go b/src/net/timeout_test.go
index 3ea0ec1ebd..86010927b3 100644
--- a/src/net/timeout_test.go
+++ b/src/net/timeout_test.go
@@ -112,7 +112,6 @@ var dialTimeoutMaxDurationTests = []struct {
 }
 
 func TestDialTimeoutMaxDuration(t *testing.T) {
-	t.Parallel()
 	if runtime.GOOS == "openbsd" {
 		testenv.SkipFlaky(t, 15157)
 	}
@@ -315,8 +314,6 @@ var readTimeoutTests = []struct {
 }
 
 func TestReadTimeout(t *testing.T) {
-	t.Parallel()
-
 	switch runtime.GOOS {
 	case "plan9":
 		t.Skipf("not supported on %s", runtime.GOOS)