aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2011-05-31 16:15:23 -0400
committerRuss Cox <rsc@golang.org>2011-05-31 16:15:23 -0400
commit4706ce309f9176f7726f824fe88ebae79ccda6e2 (patch)
tree871c44f925a42dccb500eaf01c9b1a3c52553e50
parent15dcdf751cfd9f075c3071b3ca1d5303334f2694 (diff)
downloadgo-4706ce309f9176f7726f824fe88ebae79ccda6e2.tar.gz
go-4706ce309f9176f7726f824fe88ebae79ccda6e2.zip
net: stop Mac popups
R=golang-dev, bradfitz CC=golang-dev https://golang.org/cl/4559059
-rw-r--r--src/pkg/net/server_test.go11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/pkg/net/server_test.go b/src/pkg/net/server_test.go
index 107de3e1cc..36780d789d 100644
--- a/src/pkg/net/server_test.go
+++ b/src/pkg/net/server_test.go
@@ -92,10 +92,13 @@ func connect(t *testing.T, network, addr string, isEmpty bool) {
}
func doTest(t *testing.T, network, listenaddr, dialaddr string) {
- if listenaddr == "" {
- t.Logf("Test %s %s %s\n", network, "<nil>", dialaddr)
- } else {
- t.Logf("Test %s %s %s\n", network, listenaddr, dialaddr)
+ t.Logf("Test %q %q %q\n", network, listenaddr, dialaddr)
+ switch listenaddr {
+ case "", "0.0.0.0", "[::]", "[::ffff:0.0.0.0]":
+ if testing.Short() || avoidMacFirewall {
+ t.Logf("skip wildcard listen during short test")
+ return
+ }
}
listening := make(chan string)
done := make(chan int)