go.net/ipv4: fix flaky test cases
Fixes golang/go#5709.
Fixes golang/go#5811.
LGTM=dave
R=dave
CC=golang-codereviews
https://golang.org/cl/21360043
diff --git a/ipv4/multicastsockopt_test.go b/ipv4/multicastsockopt_test.go
index 009364d..c476f34 100644
--- a/ipv4/multicastsockopt_test.go
+++ b/ipv4/multicastsockopt_test.go
@@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-// +build darwin freebsd linux netbsd openbsd windows
-
package ipv4_test
import (
@@ -14,8 +12,66 @@
"testing"
)
-type testMulticastConn interface {
- testUnicastConn
+var packetConnMulticastSocketOptionTests = []struct {
+ net, proto, addr string
+ gaddr net.Addr
+}{
+ {"udp4", "", "224.0.0.0:0", &net.UDPAddr{IP: net.IPv4(224, 0, 0, 249)}}, // see RFC 4727
+ {"ip4", ":icmp", "0.0.0.0", &net.IPAddr{IP: net.IPv4(224, 0, 0, 250)}}, // see RFC 4727
+}
+
+func TestPacketConnMulticastSocketOptions(t *testing.T) {
+ switch runtime.GOOS {
+ case "plan9":
+ t.Skipf("not supported on %q", runtime.GOOS)
+ }
+ ifi := loopbackInterface()
+ if ifi == nil {
+ t.Skipf("not available on %q", runtime.GOOS)
+ }
+
+ for _, tt := range packetConnMulticastSocketOptionTests {
+ if tt.net == "ip4" && os.Getuid() != 0 {
+ t.Skip("must be root")
+ }
+ c, err := net.ListenPacket(tt.net+tt.proto, tt.addr)
+ if err != nil {
+ t.Fatalf("net.ListenPacket failed: %v", err)
+ }
+ defer c.Close()
+
+ testMulticastSocketOptions(t, ipv4.NewPacketConn(c), ifi, tt.gaddr)
+ }
+}
+
+func TestRawConnMulticastSocketOptions(t *testing.T) {
+ switch runtime.GOOS {
+ case "plan9":
+ t.Skipf("not supported on %q", runtime.GOOS)
+ }
+ if os.Getuid() != 0 {
+ t.Skip("must be root")
+ }
+ ifi := loopbackInterface()
+ if ifi == nil {
+ t.Skipf("not available on %q", runtime.GOOS)
+ }
+
+ c, err := net.ListenPacket("ip4:icmp", "0.0.0.0")
+ if err != nil {
+ t.Fatalf("net.ListenPacket failed: %v", err)
+ }
+ defer c.Close()
+
+ r, err := ipv4.NewRawConn(c)
+ if err != nil {
+ t.Fatalf("ipv4.NewRawConn failed: %v", err)
+ }
+
+ testMulticastSocketOptions(t, r, ifi, &net.IPAddr{IP: net.IPv4(224, 0, 0, 250)}) /// see RFC 4727
+}
+
+type testIPv4MulticastConn interface {
MulticastTTL() (int, error)
SetMulticastTTL(ttl int) error
MulticastLoopback() (bool, error)
@@ -24,103 +80,32 @@
LeaveGroup(*net.Interface, net.Addr) error
}
-type multicastSockoptTest struct {
- tos int
- ttl int
- mcttl int
- mcloop bool
- gaddr net.IP
-}
-
-var multicastSockoptTests = []multicastSockoptTest{
- {DiffServCS0 | NotECNTransport, 127, 128, false, net.IPv4(224, 0, 0, 249)}, // see RFC 4727
- {DiffServAF11 | NotECNTransport, 255, 254, true, net.IPv4(224, 0, 0, 250)}, // see RFC 4727
-}
-
-func TestUDPMulticastSockopt(t *testing.T) {
- if testing.Short() || !*testExternal {
- t.Skip("to avoid external network")
- }
-
- for _, tt := range multicastSockoptTests {
- c, err := net.ListenPacket("udp4", "0.0.0.0:0")
- if err != nil {
- t.Fatalf("net.ListenPacket failed: %v", err)
- }
- defer c.Close()
-
- p := ipv4.NewPacketConn(c)
- testMulticastSockopt(t, tt, p, &net.UDPAddr{IP: tt.gaddr})
- }
-}
-
-func TestIPMulticastSockopt(t *testing.T) {
- if testing.Short() || !*testExternal {
- t.Skip("to avoid external network")
- }
- if os.Getuid() != 0 {
- t.Skip("must be root")
- }
-
- for _, tt := range multicastSockoptTests {
- c, err := net.ListenPacket("ip4:icmp", "0.0.0.0")
- if err != nil {
- t.Fatalf("net.ListenPacket failed: %v", err)
- }
- defer c.Close()
-
- r, _ := ipv4.NewRawConn(c)
- testMulticastSockopt(t, tt, r, &net.IPAddr{IP: tt.gaddr})
- }
-}
-
-func testMulticastSockopt(t *testing.T, tt multicastSockoptTest, c testMulticastConn, gaddr net.Addr) {
- switch runtime.GOOS {
- case "windows":
- // IP_TOS option is supported on Windows 8 and beyond.
- t.Logf("skipping IP_TOS test on %q", runtime.GOOS)
- default:
- if err := c.SetTOS(tt.tos); err != nil {
- t.Fatalf("ipv4.PacketConn.SetTOS failed: %v", err)
- }
- if v, err := c.TOS(); err != nil {
- t.Fatalf("ipv4.PacketConn.TOS failed: %v", err)
- } else if v != tt.tos {
- t.Fatalf("Got unexpected TOS value %v; expected %v", v, tt.tos)
- }
- }
-
- if err := c.SetTTL(tt.ttl); err != nil {
- t.Fatalf("ipv4.PacketConn.SetTTL failed: %v", err)
- }
- if v, err := c.TTL(); err != nil {
- t.Fatalf("ipv4.PacketConn.TTL failed: %v", err)
- } else if v != tt.ttl {
- t.Fatalf("Got unexpected TTL value %v; expected %v", v, tt.ttl)
- }
-
- if err := c.SetMulticastTTL(tt.mcttl); err != nil {
+func testMulticastSocketOptions(t *testing.T, c testIPv4MulticastConn, ifi *net.Interface, gaddr net.Addr) {
+ const ttl = 255
+ if err := c.SetMulticastTTL(ttl); err != nil {
t.Fatalf("ipv4.PacketConn.SetMulticastTTL failed: %v", err)
}
if v, err := c.MulticastTTL(); err != nil {
t.Fatalf("ipv4.PacketConn.MulticastTTL failed: %v", err)
- } else if v != tt.mcttl {
- t.Fatalf("Got unexpected MulticastTTL value %v; expected %v", v, tt.mcttl)
+ } else if v != ttl {
+ t.Fatalf("got unexpected multicast TTL value %v; expected %v", v, ttl)
}
- if err := c.SetMulticastLoopback(tt.mcloop); err != nil {
- t.Fatalf("ipv4.PacketConn.SetMulticastLoopback failed: %v", err)
- }
- if v, err := c.MulticastLoopback(); err != nil {
- t.Fatalf("ipv4.PacketConn.MulticastLoopback failed: %v", err)
- } else if v != tt.mcloop {
- t.Fatalf("Got unexpected MulticastLoopback value %v; expected %v", v, tt.mcloop)
+ for _, toggle := range []bool{true, false} {
+ if err := c.SetMulticastLoopback(toggle); err != nil {
+ t.Fatalf("ipv4.PacketConn.SetMulticastLoopback failed: %v", err)
+ }
+ if v, err := c.MulticastLoopback(); err != nil {
+ t.Fatalf("ipv4.PacketConn.MulticastLoopback failed: %v", err)
+ } else if v != toggle {
+ t.Fatalf("got unexpected multicast loopback %v; expected %v", v, toggle)
+ }
}
- if err := c.JoinGroup(nil, gaddr); err != nil {
- t.Fatalf("ipv4.PacketConn.JoinGroup(%v) failed: %v", gaddr, err)
+ if err := c.JoinGroup(ifi, gaddr); err != nil {
+ t.Fatalf("ipv4.PacketConn.JoinGroup(%v, %v) failed: %v", ifi, gaddr, err)
}
- if err := c.LeaveGroup(nil, gaddr); err != nil {
- t.Fatalf("ipv4.PacketConn.LeaveGroup(%v) failed: %v", gaddr, err)
+ if err := c.LeaveGroup(ifi, gaddr); err != nil {
+ t.Fatalf("ipv4.PacketConn.LeaveGroup(%v, %v) failed: %v", ifi, gaddr, err)
}
}
