Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

net: disable use of external listen along with other external network uses

Browse source 
By default the all.bash tests must not ever announce
on an external address.  It's not just an OS X issue.

R=golang-dev, mikioh.mikioh
CC=golang-dev
https://golang.org/cl/5753067
This commit is contained in:
Russ Cox 2012-03-06 23:35:31 -05:00
parent 0130a31366
commit 7c7966a426
4 changed files with 9 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/pkg/net/dial_test.go
View file

@ -32,7 +32,7 @@ func TestDialTimeout(t *testing.T) {
numConns := listenerBacklog + 10 numConns := listenerBacklog + 10
// TODO(bradfitz): It's hard to test this in a portable // TODO(bradfitz): It's hard to test this in a portable
// way. This is unforunate, but works for now. // way. This is unfortunate, but works for now.
switch runtime.GOOS { switch runtime.GOOS {
case "linux": case "linux":
// The kernel will start accepting TCP connections before userspace // The kernel will start accepting TCP connections before userspace

8
src/pkg/net/net_test.go
View file

@ -11,14 +11,6 @@ import (
"time" "time"
) )
// avoidOSXFirewallDialogPopup avoids OS X, former konwn as MacOS X,
// firewall dialog popups during tests. It looks like OS X checks
// wildcard listens by default for security reasons. A listen with
// specific address doesn't make dialog popups for now.
var avoidOSXFirewallDialogPopup = func() bool {
return testing.Short() && runtime.GOOS == "darwin"
}
func TestShutdown(t *testing.T) { func TestShutdown(t *testing.T) {
if runtime.GOOS == "plan9" { if runtime.GOOS == "plan9" {
t.Logf("skipping test on %q", runtime.GOOS) t.Logf("skipping test on %q", runtime.GOOS)

2
src/pkg/net/server_test.go
View file

@ -28,7 +28,7 @@ func skipServerTest(net, unixsotype, addr string, ipv6, ipv4map, linuxonly bool)
} }
switch addr { switch addr {
case "", "0.0.0.0", "[::ffff:0.0.0.0]", "[::]": case "", "0.0.0.0", "[::ffff:0.0.0.0]", "[::]":
if avoidOSXFirewallDialogPopup() { if testing.Short() || !*testExternal {
return true return true
} }
} }

14
src/pkg/net/unicast_test.go
View file

@ -50,7 +50,7 @@ func TestTCPListener(t *testing.T) {
} }
for _, tt := range listenerTests { for _, tt := range listenerTests {
if tt.wildcard && avoidOSXFirewallDialogPopup() { if tt.wildcard && (testing.Short() || !*testExternal) {
continue continue
} }
if tt.ipv6 && !supportsIPv6 { if tt.ipv6 && !supportsIPv6 {
@ -98,7 +98,7 @@ func TestUDPListener(t *testing.T) {
} }
for _, tt := range listenerTests { for _, tt := range listenerTests {
if tt.wildcard && avoidOSXFirewallDialogPopup() { if tt.wildcard && (testing.Short() || !*testExternal) {
continue continue
} }
if tt.ipv6 && !supportsIPv6 { if tt.ipv6 && !supportsIPv6 {
@ -132,7 +132,7 @@ func TestSimpleTCPListener(t *testing.T) {
} }
for _, tt := range listenerTests { for _, tt := range listenerTests {
if tt.wildcard && avoidOSXFirewallDialogPopup() { if tt.wildcard && (testing.Short() || !*testExternal) {
continue continue
} }
if tt.ipv6 { if tt.ipv6 {
@ -170,7 +170,7 @@ func TestSimpleUDPListener(t *testing.T) {
} }
for _, tt := range listenerTests { for _, tt := range listenerTests {
if tt.wildcard && avoidOSXFirewallDialogPopup() { if tt.wildcard && (testing.Short() || !*testExternal) {
continue continue
} }
if tt.ipv6 { if tt.ipv6 {
@ -267,7 +267,7 @@ func TestDualStackTCPListener(t *testing.T) {
} }
for _, tt := range dualStackListenerTests { for _, tt := range dualStackListenerTests {
if tt.wildcard && avoidOSXFirewallDialogPopup() { if tt.wildcard && (testing.Short() || !*testExternal) {
continue continue
} }
switch runtime.GOOS { switch runtime.GOOS {
@ -316,7 +316,7 @@ func TestDualStackUDPListener(t *testing.T) {
} }
for _, tt := range dualStackListenerTests { for _, tt := range dualStackListenerTests {
if tt.wildcard && avoidOSXFirewallDialogPopup() { if tt.wildcard && (testing.Short() || !*testExternal) {
continue continue
} }
tt.net1 = toudpnet(tt.net1) tt.net1 = toudpnet(tt.net1)
@ -531,7 +531,7 @@ func TestProhibitionaryDialArgs(t *testing.T) {
return return
} }
// This test requires both IPv6 and IPv6 IPv4-mapping functionality. // This test requires both IPv6 and IPv6 IPv4-mapping functionality.
if !supportsIPv4map || avoidOSXFirewallDialogPopup() { if !supportsIPv4map || testing.Short() || !*testExternal {
return return
} }