From 3b858fb808ea34b6ffd6567cc70cb32fddd3cd7c Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Thu, 3 Dec 2009 22:19:55 -0800 Subject: [PATCH] net: turn off empty packet test by default Fixes #374. R=r https://golang.org/cl/166053 --- src/pkg/net/server_test.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/pkg/net/server_test.go b/src/pkg/net/server_test.go index 454f1d7119..e1301ceb92 100644 --- a/src/pkg/net/server_test.go +++ b/src/pkg/net/server_test.go @@ -5,6 +5,7 @@ package net import ( + "flag"; "io"; "os"; "strings"; @@ -12,6 +13,12 @@ import ( "testing"; ) +// Do not test empty datagrams by default. +// It causes unexplained timeouts on some systems, +// including Snow Leopard. I think that the kernel +// doesn't quite expect them. +var testEmptyDatagrams = flag.Bool("empty_datagrams", false, "whether to test empty datagrams") + func runEcho(fd io.ReadWriter, done chan<- int) { var buf [1024]byte; @@ -155,7 +162,7 @@ func doTestPacket(t *testing.T, network, listenaddr, dialaddr string, isEmpty bo } func TestUDPServer(t *testing.T) { - for _, isEmpty := range []bool{false, true} { + for _, isEmpty := range []bool{false, *testEmptyDatagrams} { doTestPacket(t, "udp", "0.0.0.0", "127.0.0.1", isEmpty); doTestPacket(t, "udp", "", "127.0.0.1", isEmpty); if kernelSupportsIPv6() { @@ -167,7 +174,7 @@ func TestUDPServer(t *testing.T) { } func TestUnixDatagramServer(t *testing.T) { - for _, isEmpty := range []bool{false, true} { + for _, isEmpty := range []bool{false, *testEmptyDatagrams} { os.Remove("/tmp/gotest1.net"); os.Remove("/tmp/gotest1.net.local"); doTestPacket(t, "unixgram", "/tmp/gotest1.net", "/tmp/gotest1.net", isEmpty); -- 2.50.0