vendor: update golang.org/x/net/internal/nettest from upstream

Updates to x/net git rev 640f462 for CL 109995.

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

diff --git a/src/vendor/golang_org/x/net/internal/nettest/helper_stub.go b/src/vendor/golang_org/x/net/internal/nettest/helper_stub.go
index ea61b6f3992bb9a32e68c57355a6be3e296c5658..d729156de67fdf4cc7d25c311bee620e8ddb6a68 100644 (file)
--- a/src/vendor/golang_org/x/net/internal/nettest/helper_stub.go
+++ b/src/vendor/golang_org/x/net/internal/nettest/helper_stub.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build nacl plan9
+// +build js,wasm nacl plan9
 
 package nettest
 

diff --git a/src/vendor/golang_org/x/net/internal/nettest/stack.go b/src/vendor/golang_org/x/net/internal/nettest/stack.go
index 06f4e09ef85f840fc231848f45b0254faac83ee4..46d2fccab588c032e471f65c0ffef3bad8901837 100644 (file)
--- a/src/vendor/golang_org/x/net/internal/nettest/stack.go
+++ b/src/vendor/golang_org/x/net/internal/nettest/stack.go
@@ -64,7 +64,7 @@ func TestableNetwork(network string) bool {
        switch network {
        case "unix", "unixgram":
                switch runtime.GOOS {
-               case "android", "nacl", "plan9", "windows":
+               case "android", "js", "nacl", "plan9", "windows":
                        return false
                }
                if runtime.GOOS == "darwin" && (runtime.GOARCH == "arm" || runtime.GOARCH == "arm64") {
@@ -72,7 +72,7 @@ func TestableNetwork(network string) bool {
                }
        case "unixpacket":
                switch runtime.GOOS {
-               case "android", "darwin", "freebsd", "nacl", "plan9", "windows":
+               case "android", "darwin", "freebsd", "js", "nacl", "plan9", "windows":
                        return false
                case "netbsd":
                        // It passes on amd64 at least. 386 fails (Issue 22927). arm is unknown.