qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-23 16:50:06 -07:00
Code Releases Activity

net: don't run IP stack required tests on IP stack disabled kernels

Browse Source 
This change doesn't work perfectly on IPv6-only kernels including CLAT
enabled kernels, but works enough on IPv4-only kernels.

Fixes #10721.
Updates #10729.

Change-Id: I7db0e572e252aa0a9f9f54c8e557955077b72e44
Reviewed-on: https://go-review.googlesource.com/9777
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
This commit is contained in:
Mikio Hara 2015-05-07 08:20:42 +09:00
parent 76d67eaccc
commit f963cb707e
4 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/net/dial_test.go
View File

@ -155,7 +155,7 @@ func TestDialerDualStackFDLeak(t *testing.T) {
t.Skipf("not implemented a way to cancel dial racers in TCP SYN-SENT state on %s", runtime.GOOS)
}
if !supportsIPv4 || !supportsIPv6 {
t.Skip("ipv4 or ipv6 is not supported")
t.Skip("both IPv4 and IPv6 are required")
}
origTestHookLookupIP := testHookLookupIP
@ -247,7 +247,7 @@ func TestDialerLocalAddr(t *testing.T) {
func TestDialerDualStack(t *testing.T) {
if !supportsIPv4 || !supportsIPv6 {
t.Skip("ipv4 or ipv6 is not supported")
t.Skip("both IPv4 and IPv6 are required")
}
origTestHookLookupIP := testHookLookupIP

2
src/net/ipsock_test.go
View File

@ -216,7 +216,7 @@ var addrListTests = []struct {
func TestAddrList(t *testing.T) {
if !supportsIPv4 || !supportsIPv6 {
t.Skip("ipv4 or ipv6 is not supported")
t.Skip("both IPv4 and IPv6 are required")
}
for i, tt := range addrListTests {

8
src/net/listen_test.go
View File

@ -218,9 +218,14 @@ var dualStackTCPListenerTests = []struct {
// listening address and same port.
func TestDualStackTCPListener(t *testing.T) {
switch runtime.GOOS {
case "dragonfly":
t.Skip("not supported on DragonFly, see golang.org/issue/10729")
case "nacl", "plan9":
t.Skipf("not supported on %s", runtime.GOOS)
}
if !supportsIPv4 || !supportsIPv6 {
t.Skip("both IPv4 and IPv6 are required")
}
for _, tt := range dualStackTCPListenerTests {
if !testableListenArgs(tt.network1, JoinHostPort(tt.address1, "0"), "") {
@ -305,6 +310,9 @@ func TestDualStackUDPListener(t *testing.T) {
case "nacl", "plan9":
t.Skipf("not supported on %s", runtime.GOOS)
}
if !supportsIPv4 || !supportsIPv6 {
t.Skip("both IPv4 and IPv6 are required")
}
for _, tt := range dualStackUDPListenerTests {
if !testableListenArgs(tt.network1, JoinHostPort(tt.address1, "0"), "") {

17
src/net/platform_test.go
View File

@ -103,15 +103,26 @@ func testableListenArgs(network, address, client string) bool {
return false
}
// Test functionality of IPv6 communication using AF_INET6
// sockets.
// Test functionality of IPv4 communication using AF_INET and
// IPv6 communication using AF_INET6 sockets.
if !supportsIPv4 && ip.To4() != nil {
return false
}
if !supportsIPv6 && ip.To16() != nil && ip.To4() == nil {
return false
}
cip := ParseIP(client)
if cip != nil {
if !supportsIPv4 && cip.To4() != nil {
return false
}
if !supportsIPv6 && cip.To16() != nil && cip.To4() == nil {
return false
}
}
// Test functionality of IPv4 communication using AF_INET6
// sockets.
cip := ParseIP(client)
if !supportsIPv4map && (network == "tcp" || network == "udp" || network == "ip") && wildcard {
// At this point, we prefer IPv4 when ip is nil.
// See favoriteAddrFamily for further information.