From: David du Colombier <0intro@gmail.com>
Date: Thu, 25 May 2017 01:21:17 +0000 (+0200)
Subject: vendor: update golang.org/x/net/nettest
X-Git-Tag: go1.9beta1~160
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=00e6b34fed7991e560f99c7b92f6bd1bacbe9a75;p=gostls13.git

vendor: update golang.org/x/net/nettest

Update golang.org/x/net/nettest to revision 7dcfb8076726a3fdd9353b6b8a1f1b6be6811bd6.

Change-Id: Ib6505423910d34142d7b1bcb6792a5017df4da47
Reviewed-on: https://go-review.googlesource.com/44131
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: David du Colombier <0intro@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
---

diff --git a/src/vendor/golang_org/x/net/nettest/conntest.go b/src/vendor/golang_org/x/net/nettest/conntest.go
index c246bbe399..5bd3a8c68c 100644
--- a/src/vendor/golang_org/x/net/nettest/conntest.go
+++ b/src/vendor/golang_org/x/net/nettest/conntest.go
@@ -12,6 +12,7 @@ import (
 	"io/ioutil"
 	"math/rand"
 	"net"
+	"runtime"
 	"sync"
 	"testing"
 	"time"
@@ -341,6 +342,9 @@ func testCloseTimeout(t *testing.T, c1, c2 net.Conn) {
 // testConcurrentMethods tests that the methods of net.Conn can safely
 // be called concurrently.
 func testConcurrentMethods(t *testing.T, c1, c2 net.Conn) {
+	if runtime.GOOS == "plan9" {
+		t.Skip("skipping on plan9; see https://golang.org/issue/20489")
+	}
 	go chunkedCopy(c2, c2)
 
 	// The results of the calls may be nonsensical, but this should
@@ -433,6 +437,7 @@ func resyncConn(t *testing.T, c net.Conn) {
 		}
 		if err != nil {
 			t.Errorf("unexpected Read error: %v", err)
+			break
 		}
 	}
 	if err := <-errCh; err != nil {