Commit 3b858fb8 authored by Russ Cox's avatar Russ Cox

net: turn off empty packet test by default

Fixes #374.

R=r
https://golang.org/cl/166053
parent 9da6666a
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
package net package net
import ( import (
"flag";
"io"; "io";
"os"; "os";
"strings"; "strings";
...@@ -12,6 +13,12 @@ import ( ...@@ -12,6 +13,12 @@ import (
"testing"; "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) { func runEcho(fd io.ReadWriter, done chan<- int) {
var buf [1024]byte; var buf [1024]byte;
...@@ -155,7 +162,7 @@ func doTestPacket(t *testing.T, network, listenaddr, dialaddr string, isEmpty bo ...@@ -155,7 +162,7 @@ func doTestPacket(t *testing.T, network, listenaddr, dialaddr string, isEmpty bo
} }
func TestUDPServer(t *testing.T) { 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", "0.0.0.0", "127.0.0.1", isEmpty);
doTestPacket(t, "udp", "", "127.0.0.1", isEmpty); doTestPacket(t, "udp", "", "127.0.0.1", isEmpty);
if kernelSupportsIPv6() { if kernelSupportsIPv6() {
...@@ -167,7 +174,7 @@ func TestUDPServer(t *testing.T) { ...@@ -167,7 +174,7 @@ func TestUDPServer(t *testing.T) {
} }
func TestUnixDatagramServer(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");
os.Remove("/tmp/gotest1.net.local"); os.Remove("/tmp/gotest1.net.local");
doTestPacket(t, "unixgram", "/tmp/gotest1.net", "/tmp/gotest1.net", isEmpty); doTestPacket(t, "unixgram", "/tmp/gotest1.net", "/tmp/gotest1.net", isEmpty);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment