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/header_test.go b/ipv4/header_test.go
index 41cba60..05e3135 100644
--- a/ipv4/header_test.go
+++ b/ipv4/header_test.go
@@ -70,7 +70,7 @@
func TestMarshalHeader(t *testing.T) {
b, err := testHeader.Marshal()
if err != nil {
- t.Fatalf("ipv4.Header.Marshal failed: %v", err)
+ t.Fatal(err)
}
var wh []byte
if supportsNewIPInput {
@@ -79,7 +79,7 @@
wh = wireHeaderToTradBSDKernel[:]
}
if !bytes.Equal(b, wh) {
- t.Fatalf("ipv4.Header.Marshal failed: %#v not equal %#v", b, wh)
+ t.Fatalf("got %#v; want %#v", b, wh)
}
}
@@ -96,9 +96,9 @@
}
h, err := ParseHeader(wh)
if err != nil {
- t.Fatalf("ipv4.ParseHeader failed: %v", err)
+ t.Fatal(err)
}
if !reflect.DeepEqual(h, testHeader) {
- t.Fatalf("ipv4.ParseHeader failed: %#v not equal %#v", h, testHeader)
+ t.Fatalf("got %#v; want %#v", h, testHeader)
}
}
