Commit 00e6b34f authored by David du Colombier's avatar David du Colombier

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/44131Reviewed-by: default avatarBrad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: David du Colombier <0intro@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
parent daa0ddde
...@@ -12,6 +12,7 @@ import ( ...@@ -12,6 +12,7 @@ import (
"io/ioutil" "io/ioutil"
"math/rand" "math/rand"
"net" "net"
"runtime"
"sync" "sync"
"testing" "testing"
"time" "time"
...@@ -341,6 +342,9 @@ func testCloseTimeout(t *testing.T, c1, c2 net.Conn) { ...@@ -341,6 +342,9 @@ func testCloseTimeout(t *testing.T, c1, c2 net.Conn) {
// testConcurrentMethods tests that the methods of net.Conn can safely // testConcurrentMethods tests that the methods of net.Conn can safely
// be called concurrently. // be called concurrently.
func testConcurrentMethods(t *testing.T, c1, c2 net.Conn) { 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) go chunkedCopy(c2, c2)
// The results of the calls may be nonsensical, but this should // The results of the calls may be nonsensical, but this should
...@@ -433,6 +437,7 @@ func resyncConn(t *testing.T, c net.Conn) { ...@@ -433,6 +437,7 @@ func resyncConn(t *testing.T, c net.Conn) {
} }
if err != nil { if err != nil {
t.Errorf("unexpected Read error: %v", err) t.Errorf("unexpected Read error: %v", err)
break
} }
} }
if err := <-errCh; err != nil { if err := <-errCh; err != nil {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment