net: make newLocalListener handle network argument correcly

Change-Id: I8987e705af069846e6668e2f2104e0254e695139
Reviewed-on: https://go-review.googlesource.com/19706
Run-TryBot: Mikio Hara <mikioh.mikioh@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>

diff --git a/src/net/mockserver_test.go b/src/net/mockserver_test.go
index dd6f4df3b9c0978772557b664b2c65a8b1903422..38b317af7dbd7e47f439c6c062b0a77d7f574df2 100644 (file)
--- a/src/net/mockserver_test.go
+++ b/src/net/mockserver_test.go
@@ -30,10 +30,20 @@ func testUnixAddr() string {
 
 func newLocalListener(network string) (Listener, error) {
        switch network {
-       case "tcp", "tcp4", "tcp6":
+       case "tcp":
+               if supportsIPv4 {
+                       if ln, err := Listen("tcp4", "127.0.0.1:0"); err == nil {
+                               return ln, nil
+                       }
+               }
+               if supportsIPv6 {
+                       return Listen("tcp6", "[::1]:0")
+               }
+       case "tcp4":
                if supportsIPv4 {
                        return Listen("tcp4", "127.0.0.1:0")
                }
+       case "tcp6":
                if supportsIPv6 {
                        return Listen("tcp6", "[::1]:0")
                }