1 files changed, 5 insertions, 66 deletions

diff --git a/vendor/golang.org/x/net/internal/netreflect/socket_test.go b/vendor/golang.org/x/net/internal/netreflect/socket_test.go
index 305665ac1..49b97ed54 100644
--- a/vendor/golang.org/x/net/internal/netreflect/socket_test.go
+++ b/vendor/golang.org/x/net/internal/netreflect/socket_test.go
@@ -5,76 +5,20 @@
 package netreflect_test
 
 import (
-	"fmt"
-	"io/ioutil"
 	"net"
 	"os"
-	"runtime"
 	"testing"
 
 	"golang.org/x/net/internal/netreflect"
+	"golang.org/x/net/internal/nettest"
 )
 
-func localPath() string {
-	f, err := ioutil.TempFile("", "netreflect")
-	if err != nil {
-		panic(err)
-	}
-	path := f.Name()
-	f.Close()
-	os.Remove(path)
-	return path
-}
-
-func newLocalListener(network string) (net.Listener, error) {
-	switch network {
-	case "tcp":
-		if ln, err := net.Listen("tcp4", "127.0.0.1:0"); err == nil {
-			return ln, nil
-		}
-		return net.Listen("tcp6", "[::1]:0")
-	case "tcp4":
-		return net.Listen("tcp4", "127.0.0.1:0")
-	case "tcp6":
-		return net.Listen("tcp6", "[::1]:0")
-	case "unix", "unixpacket":
-		return net.Listen(network, localPath())
-	}
-	return nil, fmt.Errorf("%s is not supported", network)
-}
-
-func newLocalPacketListener(network string) (net.PacketConn, error) {
-	switch network {
-	case "udp":
-		if c, err := net.ListenPacket("udp4", "127.0.0.1:0"); err == nil {
-			return c, nil
-		}
-		return net.ListenPacket("udp6", "[::1]:0")
-	case "udp4":
-		return net.ListenPacket("udp4", "127.0.0.1:0")
-	case "udp6":
-		return net.ListenPacket("udp6", "[::1]:0")
-	case "unixgram":
-		return net.ListenPacket(network, localPath())
-	}
-	return nil, fmt.Errorf("%s is not supported", network)
-}
-
 func TestSocketOf(t *testing.T) {
 	for _, network := range []string{"tcp", "unix", "unixpacket"} {
-		switch runtime.GOOS {
-		case "darwin":
-			if network == "unixpacket" {
-				continue
-			}
-		case "nacl", "plan9":
+		if !nettest.TestableNetwork(network) {
 			continue
-		case "windows":
-			if network == "unix" || network == "unixpacket" {
-				continue
-			}
 		}
-		ln, err := newLocalListener(network)
+		ln, err := nettest.NewLocalListener(network)
 		if err != nil {
 			t.Error(err)
 			continue
@@ -101,15 +45,10 @@ func TestSocketOf(t *testing.T) {
 
 func TestPacketSocketOf(t *testing.T) {
 	for _, network := range []string{"udp", "unixgram"} {
-		switch runtime.GOOS {
-		case "nacl", "plan9":
+		if !nettest.TestableNetwork(network) {
 			continue
-		case "windows":
-			if network == "unixgram" {
-				continue
-			}
 		}
-		c, err := newLocalPacketListener(network)
+		c, err := nettest.NewLocalPacketListener(network)
 		if err != nil {
 			t.Error(err)
 			continue