go.net/ipv4: use testing.Skip{,f}
R=bradfitz, dave
CC=bradfitz, gobot, golang-dev, rsc
https://golang.org/cl/7194047
diff --git a/ipv4/multicastsockopt_test.go b/ipv4/multicastsockopt_test.go
index 3f22739..e8a7691 100644
--- a/ipv4/multicastsockopt_test.go
+++ b/ipv4/multicastsockopt_test.go
@@ -39,8 +39,7 @@
func TestUDPMulticastSockopt(t *testing.T) {
if testing.Short() || !*testExternal {
- t.Logf("skipping test to avoid external network")
- return
+ t.Skip("to avoid external network")
}
for _, tt := range multicastSockoptTests {
@@ -57,12 +56,10 @@
func TestIPMulticastSockopt(t *testing.T) {
if testing.Short() || !*testExternal {
- t.Logf("skipping test to avoid external network")
- return
+ t.Skip("to avoid external network")
}
if os.Getuid() != 0 {
- t.Logf("skipping test; must be root")
- return
+ t.Skip("must be root")
}
for _, tt := range multicastSockoptTests {
