x/net/ipv4: fix full stack test cases
Readjusts ICMP test cases on older darwin kernels
Also simplifies error logs.
LGTM=iant
R=iant
CC=golang-codereviews
https://golang.org/cl/178740043
diff --git a/ipv4/readwrite_test.go b/ipv4/readwrite_test.go
index fbb2082..e595443 100644
--- a/ipv4/readwrite_test.go
+++ b/ipv4/readwrite_test.go
@@ -31,7 +31,7 @@
func BenchmarkReadWriteNetUDP(b *testing.B) {
c, dst, err := benchmarkUDPListener()
if err != nil {
- b.Fatalf("benchmarkUDPListener failed: %v", err)
+ b.Fatal(err)
}
defer c.Close()
@@ -44,17 +44,17 @@
func benchmarkReadWriteNetUDP(b *testing.B, c net.PacketConn, wb, rb []byte, dst net.Addr) {
if _, err := c.WriteTo(wb, dst); err != nil {
- b.Fatalf("net.PacketConn.WriteTo failed: %v", err)
+ b.Fatal(err)
}
if _, _, err := c.ReadFrom(rb); err != nil {
- b.Fatalf("net.PacketConn.ReadFrom failed: %v", err)
+ b.Fatal(err)
}
}
func BenchmarkReadWriteIPv4UDP(b *testing.B) {
c, dst, err := benchmarkUDPListener()
if err != nil {
- b.Fatalf("benchmarkUDPListener failed: %v", err)
+ b.Fatal(err)
}
defer c.Close()
@@ -62,7 +62,7 @@
defer p.Close()
cf := ipv4.FlagTTL | ipv4.FlagInterface
if err := p.SetControlMessage(cf, true); err != nil {
- b.Fatalf("ipv4.PacketConn.SetControlMessage failed: %v", err)
+ b.Fatal(err)
}
ifi := nettest.RoutedInterface("ip4", net.FlagUp|net.FlagLoopback)
@@ -79,12 +79,12 @@
cm.IfIndex = ifi.Index
}
if n, err := p.WriteTo(wb, &cm, dst); err != nil {
- b.Fatalf("ipv4.PacketConn.WriteTo failed: %v", err)
+ b.Fatal(err)
} else if n != len(wb) {
- b.Fatalf("ipv4.PacketConn.WriteTo failed: short write: %v", n)
+ b.Fatalf("got %v; want %v", n, len(wb))
}
if _, _, _, err := p.ReadFrom(rb); err != nil {
- b.Fatalf("ipv4.PacketConn.ReadFrom failed: %v", err)
+ b.Fatal(err)
}
}
@@ -115,7 +115,7 @@
if nettest.ProtocolNotSupported(err) {
t.Skipf("not supported on %q", runtime.GOOS)
}
- t.Fatalf("ipv4.PacketConn.SetControlMessage failed: %v", err)
+ t.Fatal(err)
}
var wg sync.WaitGroup
