From 7f051930ff5572743fafd972a3ebf94bc7509a38 Mon Sep 17 00:00:00 2001 From: Michael Haro Date: Thu, 26 Feb 2015 00:49:59 -0800 Subject: [PATCH] Use %v as the format arg for errors --- clientconfig_test.go | 2 +- parse_test.go | 24 ++++++++++++------------ privaterr_test.go | 7 ++++--- server_test.go | 22 +++++++++++----------- 4 files changed, 28 insertions(+), 27 deletions(-) diff --git a/clientconfig_test.go b/clientconfig_test.go index a261ff0e..f01a59be 100644 --- a/clientconfig_test.go +++ b/clientconfig_test.go @@ -32,7 +32,7 @@ func testConfig(t *testing.T, data string) { } cc, err := ClientConfigFromFile(path) if err != nil { - t.Errorf("error parsing resolv.conf: %s", err) + t.Errorf("error parsing resolv.conf: %v", err) } if l := len(cc.Servers); l != 2 { t.Errorf("incorrect number of nameservers detected: %d", l) diff --git a/parse_test.go b/parse_test.go index a6f5a02c..6fced3f9 100644 --- a/parse_test.go +++ b/parse_test.go @@ -38,7 +38,7 @@ func TestDotLastInLabel(t *testing.T) { buf := make([]byte, 20) _, err := PackDomainName(sample, buf, 0, nil, false) if err != nil { - t.Fatalf("unexpected error packing domain: %s", err) + t.Fatalf("unexpected error packing domain: %v", err) } dom, _, _ := UnpackDomainName(buf, 0) if dom != sample { @@ -646,17 +646,17 @@ b1slImA8YVJyuIDsj7kwzG7jnERNqnWxZ48AWkskmdHaVDP4BcelrTI3rMXdXF5D rvs2.example.com. )` rr, err := NewRR(h) if err != nil { - t.Fatalf("failed to parse RR: %s", err) + t.Fatalf("failed to parse RR: %v", err) } t.Logf("RR: %s", rr) msg := new(Msg) msg.Answer = []RR{rr, rr} bytes, err := msg.Pack() if err != nil { - t.Fatalf("failed to pack msg: %s", err) + t.Fatalf("failed to pack msg: %v", err) } if err := msg.Unpack(bytes); err != nil { - t.Fatalf("failed to unpack msg: %s", err) + t.Fatalf("failed to unpack msg: %v", err) } if len(msg.Answer) != 2 { t.Fatalf("2 answers expected: %v", msg) @@ -981,7 +981,7 @@ func TestEUIxx(t *testing.T) { for i, o := range tests { r, err := NewRR(i) if err != nil { - t.Errorf("failed to parse %s: %s", i, err) + t.Errorf("failed to parse %s: %v", i, err) } if r.String() != o { t.Errorf("want %s, got %s", o, r.String()) @@ -998,7 +998,7 @@ func TestUserRR(t *testing.T) { for i, o := range tests { r, err := NewRR(i) if err != nil { - t.Errorf("failed to parse %s: %s", i, err) + t.Errorf("failed to parse %s: %v", i, err) } if r.String() != o { t.Errorf("want %s, got %s", o, r.String()) @@ -1236,7 +1236,7 @@ func TestNewRRSpecial(t *testing.T) { rr, err = NewRR("; comment") expect = "" if err != nil { - t.Errorf("unexpected err: %s", err) + t.Errorf("unexpected err: %v", err) } if rr != nil { t.Errorf("unexpected result: [%s] != [%s]", rr, expect) @@ -1245,7 +1245,7 @@ func TestNewRRSpecial(t *testing.T) { rr, err = NewRR("") expect = "" if err != nil { - t.Errorf("unexpected err: %s", err) + t.Errorf("unexpected err: %v", err) } if rr != nil { t.Errorf("unexpected result: [%s] != [%s]", rr, expect) @@ -1254,7 +1254,7 @@ func TestNewRRSpecial(t *testing.T) { rr, err = NewRR("$ORIGIN foo.") expect = "" if err != nil { - t.Errorf("unexpected err: %s", err) + t.Errorf("unexpected err: %v", err) } if rr != nil { t.Errorf("unexpected result: [%s] != [%s]", rr, expect) @@ -1263,7 +1263,7 @@ func TestNewRRSpecial(t *testing.T) { rr, err = NewRR(" ") expect = "" if err != nil { - t.Errorf("unexpected err: %s", err) + t.Errorf("unexpected err: %v", err) } if rr != nil { t.Errorf("unexpected result: [%s] != [%s]", rr, expect) @@ -1272,7 +1272,7 @@ func TestNewRRSpecial(t *testing.T) { rr, err = NewRR("\n") expect = "" if err != nil { - t.Errorf("unexpected err: %s", err) + t.Errorf("unexpected err: %v", err) } if rr != nil { t.Errorf("unexpected result: [%s] != [%s]", rr, expect) @@ -1281,7 +1281,7 @@ func TestNewRRSpecial(t *testing.T) { rr, err = NewRR("foo. A 1.1.1.1\nbar. A 2.2.2.2") expect = "foo.\t3600\tIN\tA\t1.1.1.1" if err != nil { - t.Errorf("unexpected err: %s", err) + t.Errorf("unexpected err: %v", err) } if rr == nil || rr.String() != expect { t.Errorf("unexpected result: [%s] != [%s]", rr, expect) diff --git a/privaterr_test.go b/privaterr_test.go index 6f1dff89..d45084c6 100644 --- a/privaterr_test.go +++ b/privaterr_test.go @@ -1,9 +1,10 @@ package dns_test import ( - "github.com/miekg/dns" "strings" "testing" + + "github.com/miekg/dns" ) const TypeISBN uint16 = 0x0F01 @@ -75,7 +76,7 @@ func TestPrivateByteSlice(t *testing.T) { buf := make([]byte, 100) off, err := dns.PackRR(rr, buf, 0, nil, false) if err != nil { - t.Errorf("got error packing ISBN: %s", err) + t.Errorf("got error packing ISBN: %v", err) } custrr := rr.(*dns.PrivateRR) @@ -85,7 +86,7 @@ func TestPrivateByteSlice(t *testing.T) { rr1, off1, err := dns.UnpackRR(buf[:off], 0) if err != nil { - t.Errorf("got error unpacking ISBN: %s", err) + t.Errorf("got error unpacking ISBN: %v", err) } if off1 != off { diff --git a/server_test.go b/server_test.go index 3b908bac..c2422b1f 100644 --- a/server_test.go +++ b/server_test.go @@ -95,7 +95,7 @@ func TestServing(t *testing.T) { s, addrstr, err := RunLocalUDPServer("127.0.0.1:0") if err != nil { - t.Fatalf("Unable to run test server: %s", err) + t.Fatalf("Unable to run test server: %v", err) } defer s.Shutdown() @@ -141,7 +141,7 @@ func BenchmarkServe(b *testing.B) { s, addrstr, err := RunLocalUDPServer("127.0.0.1:0") if err != nil { - b.Fatalf("Unable to run test server: %s", err) + b.Fatalf("Unable to run test server: %v", err) } defer s.Shutdown() @@ -163,7 +163,7 @@ func benchmarkServe6(b *testing.B) { a := runtime.GOMAXPROCS(4) s, addrstr, err := RunLocalUDPServer("[::1]:0") if err != nil { - b.Fatalf("Unable to run test server: %s", err) + b.Fatalf("Unable to run test server: %v", err) } defer s.Shutdown() @@ -194,7 +194,7 @@ func BenchmarkServeCompress(b *testing.B) { a := runtime.GOMAXPROCS(4) s, addrstr, err := RunLocalUDPServer("127.0.0.1:0") if err != nil { - b.Fatalf("Unable to run test server: %s", err) + b.Fatalf("Unable to run test server: %v", err) } defer s.Shutdown() @@ -295,7 +295,7 @@ func TestServingLargeResponses(t *testing.T) { s, addrstr, err := RunLocalUDPServer("127.0.0.1:0") if err != nil { - t.Fatalf("Unable to run test server: %s", err) + t.Fatalf("Unable to run test server: %v", err) } defer s.Shutdown() @@ -335,7 +335,7 @@ func TestServingResponse(t *testing.T) { HandleFunc("miek.nl.", HelloServer) s, addrstr, err := RunLocalUDPServer("127.0.0.1:0") if err != nil { - t.Fatalf("Unable to run test server: %s", err) + t.Fatalf("Unable to run test server: %v", err) } c := new(Client) @@ -355,7 +355,7 @@ func TestServingResponse(t *testing.T) { s.Shutdown() s, addrstr, err = RunLocalUDPServerUnsafe("127.0.0.1:0") if err != nil { - t.Fatalf("Unable to run test server: %s", err) + t.Fatalf("Unable to run test server: %v", err) } defer s.Shutdown() @@ -369,21 +369,21 @@ func TestServingResponse(t *testing.T) { func TestShutdownTCP(t *testing.T) { s, _, err := RunLocalTCPServer("127.0.0.1:0") if err != nil { - t.Fatalf("Unable to run test server: %s", err) + t.Fatalf("Unable to run test server: %v", err) } err = s.Shutdown() if err != nil { - t.Errorf("Could not shutdown test TCP server, %s", err) + t.Errorf("Could not shutdown test TCP server, %v", err) } } func TestShutdownUDP(t *testing.T) { s, _, err := RunLocalUDPServer("127.0.0.1:0") if err != nil { - t.Fatalf("Unable to run test server: %s", err) + t.Fatalf("Unable to run test server: %v", err) } err = s.Shutdown() if err != nil { - t.Errorf("Could not shutdown test UDP server, %s", err) + t.Errorf("Could not shutdown test UDP server, %v", err) } }