Lowercase all error msg from the tests

This commit is contained in:
Miek Gieben 2015-11-26 14:12:38 +00:00
parent 9e23f0c96e
commit f520760857
9 changed files with 49 additions and 54 deletions

View File

@ -14,7 +14,7 @@ func TestClientSync(t *testing.T) {
s, addrstr, err := RunLocalUDPServer("127.0.0.1:0") s, addrstr, err := RunLocalUDPServer("127.0.0.1:0")
if err != nil { if err != nil {
t.Fatalf("Unable to run test server: %v", err) t.Fatalf("unable to run test server: %v", err)
} }
defer s.Shutdown() defer s.Shutdown()
@ -45,7 +45,7 @@ func TestClientSyncBadId(t *testing.T) {
s, addrstr, err := RunLocalUDPServer("127.0.0.1:0") s, addrstr, err := RunLocalUDPServer("127.0.0.1:0")
if err != nil { if err != nil {
t.Fatalf("Unable to run test server: %v", err) t.Fatalf("unable to run test server: %v", err)
} }
defer s.Shutdown() defer s.Shutdown()
@ -68,7 +68,7 @@ func TestClientEDNS0(t *testing.T) {
s, addrstr, err := RunLocalUDPServer("127.0.0.1:0") s, addrstr, err := RunLocalUDPServer("127.0.0.1:0")
if err != nil { if err != nil {
t.Fatalf("Unable to run test server: %v", err) t.Fatalf("unable to run test server: %v", err)
} }
defer s.Shutdown() defer s.Shutdown()
@ -115,7 +115,7 @@ func TestClientEDNS0Local(t *testing.T) {
s, addrstr, err := RunLocalUDPServer("127.0.0.1:0") s, addrstr, err := RunLocalUDPServer("127.0.0.1:0")
if err != nil { if err != nil {
t.Fatalf("Unable to run test server: %s", err) t.Fatalf("unable to run test server: %s", err)
} }
defer s.Shutdown() defer s.Shutdown()
@ -198,7 +198,7 @@ func TestClientConn(t *testing.T) {
// This uses TCP just to make it slightly different than TestClientSync // This uses TCP just to make it slightly different than TestClientSync
s, addrstr, err := RunLocalTCPServer("127.0.0.1:0") s, addrstr, err := RunLocalTCPServer("127.0.0.1:0")
if err != nil { if err != nil {
t.Fatalf("Unable to run test server: %v", err) t.Fatalf("unable to run test server: %v", err)
} }
defer s.Shutdown() defer s.Shutdown()

View File

@ -22,13 +22,13 @@ nameserver 11.28.10.1` // <- NOTE: NO newline.
func testConfig(t *testing.T, data string) { func testConfig(t *testing.T, data string) {
tempDir, err := ioutil.TempDir("", "") tempDir, err := ioutil.TempDir("", "")
if err != nil { if err != nil {
t.Fatalf("TempDir: %v", err) t.Fatalf("tempDir: %v", err)
} }
defer os.RemoveAll(tempDir) defer os.RemoveAll(tempDir)
path := filepath.Join(tempDir, "resolv.conf") path := filepath.Join(tempDir, "resolv.conf")
if err := ioutil.WriteFile(path, []byte(data), 0644); err != nil { if err := ioutil.WriteFile(path, []byte(data), 0644); err != nil {
t.Fatalf("WriteFile: %v", err) t.Fatalf("writeFile: %v", err)
} }
cc, err := ClientConfigFromFile(path) cc, err := ClientConfigFromFile(path)
if err != nil { if err != nil {
@ -46,10 +46,5 @@ func testConfig(t *testing.T, data string) {
} }
} }
func TestNameserver(t *testing.T) { func TestNameserver(t *testing.T) { testConfig(t, normal) }
testConfig(t, normal) func TestMissingFinalNewLine(t *testing.T) { testConfig(t, missingNewline) }
}
func TestMissingFinalNewLine(t *testing.T) {
testConfig(t, missingNewline)
}

View File

@ -462,7 +462,7 @@ PrivateKey: WURgWHCcYIYUPWgeLmiPY2DJJk02vgrmTfitxgqcL4vwW7BOrbawVmVe0d9V94SR`
} }
if err := sig.Verify(eckey.(*DNSKEY), []RR{a}); err != nil { if err := sig.Verify(eckey.(*DNSKEY), []RR{a}); err != nil {
t.Fatalf("Failure to validate:\n%s\n%s\n%s\n\n%s\n\n%v", t.Fatalf("failure to validate:\n%s\n%s\n%s\n\n%s\n\n%v",
eckey.(*DNSKEY).String(), eckey.(*DNSKEY).String(),
a.String(), a.String(),
sig.String(), sig.String(),
@ -511,7 +511,7 @@ func TestSignVerifyECDSA2(t *testing.T) {
err = sig.Verify(key, []RR{srv}) err = sig.Verify(key, []RR{srv})
if err != nil { if err != nil {
t.Logf("Failure to validate:\n%s\n%s\n%s\n\n%s\n\n%v", t.Logf("failure to validate:\n%s\n%s\n%s\n\n%s\n\n%v",
key.String(), key.String(),
srv.String(), srv.String(),
sig.String(), sig.String(),
@ -565,7 +565,7 @@ PrivateKey: GU6SnQ/Ou+xC5RumuIUIuJZteXT2z0O/ok1s38Et6mQ=`
t.Fatal(err) t.Fatal(err)
} }
if err = rrRRSIG.(*RRSIG).Verify(rrDNSKEY.(*DNSKEY), []RR{rrA}); err != nil { if err = rrRRSIG.(*RRSIG).Verify(rrDNSKEY.(*DNSKEY), []RR{rrA}); err != nil {
t.Errorf("Failure to validate the spec RRSIG: %v", err) t.Errorf("failure to validate the spec RRSIG: %v", err)
} }
ourRRSIG := &RRSIG{ ourRRSIG := &RRSIG{
@ -584,7 +584,7 @@ PrivateKey: GU6SnQ/Ou+xC5RumuIUIuJZteXT2z0O/ok1s38Et6mQ=`
} }
if err = ourRRSIG.Verify(rrDNSKEY.(*DNSKEY), []RR{rrA}); err != nil { if err = ourRRSIG.Verify(rrDNSKEY.(*DNSKEY), []RR{rrA}); err != nil {
t.Errorf("Failure to validate our RRSIG: %v", err) t.Errorf("failure to validate our RRSIG: %v", err)
} }
// Signatures are randomized // Signatures are randomized
@ -641,7 +641,7 @@ PrivateKey: WURgWHCcYIYUPWgeLmiPY2DJJk02vgrmTfitxgqcL4vwW7BOrbawVmVe0d9V94SR`
t.Fatal(err) t.Fatal(err)
} }
if err = rrRRSIG.(*RRSIG).Verify(rrDNSKEY.(*DNSKEY), []RR{rrA}); err != nil { if err = rrRRSIG.(*RRSIG).Verify(rrDNSKEY.(*DNSKEY), []RR{rrA}); err != nil {
t.Errorf("Failure to validate the spec RRSIG: %v", err) t.Errorf("failure to validate the spec RRSIG: %v", err)
} }
ourRRSIG := &RRSIG{ ourRRSIG := &RRSIG{
@ -660,7 +660,7 @@ PrivateKey: WURgWHCcYIYUPWgeLmiPY2DJJk02vgrmTfitxgqcL4vwW7BOrbawVmVe0d9V94SR`
} }
if err = ourRRSIG.Verify(rrDNSKEY.(*DNSKEY), []RR{rrA}); err != nil { if err = ourRRSIG.Verify(rrDNSKEY.(*DNSKEY), []RR{rrA}); err != nil {
t.Errorf("Failure to validate our RRSIG: %v", err) t.Errorf("failure to validate our RRSIG: %v", err)
} }
// Signatures are randomized // Signatures are randomized

View File

@ -145,13 +145,13 @@ func TestTXTEscapeParsing(t *testing.T) {
for _, s := range test { for _, s := range test {
rr, err := NewRR(fmt.Sprintf("example.com. IN TXT %v", s[0])) rr, err := NewRR(fmt.Sprintf("example.com. IN TXT %v", s[0]))
if err != nil { if err != nil {
t.Errorf("Could not parse %v TXT: %s", s[0], err) t.Errorf("could not parse %v TXT: %s", s[0], err)
continue continue
} }
txt := sprintTxt(rr.(*TXT).Txt) txt := sprintTxt(rr.(*TXT).Txt)
if txt != s[1] { if txt != s[1] {
t.Errorf("Mismatch after parsing `%v` TXT record: `%v` != `%v`", s[0], txt, s[1]) t.Errorf("mismatch after parsing `%v` TXT record: `%v` != `%v`", s[0], txt, s[1])
} }
} }
} }

View File

@ -90,11 +90,11 @@ func TestPrivateByteSlice(t *testing.T) {
} }
if off1 != off { if off1 != off {
t.Errorf("Offset after unpacking differs: %d != %d", off1, off) t.Errorf("offset after unpacking differs: %d != %d", off1, off)
} }
if rr1.String() != testrecord { if rr1.String() != testrecord {
t.Errorf("Record string representation did not match original %#v != %#v", rr1.String(), testrecord) t.Errorf("record string representation did not match original %#v != %#v", rr1.String(), testrecord)
} else { } else {
t.Log(rr1.String()) t.Log(rr1.String())
} }

View File

@ -108,7 +108,7 @@ func TestServing(t *testing.T) {
s, addrstr, err := RunLocalUDPServer("127.0.0.1:0") s, addrstr, err := RunLocalUDPServer("127.0.0.1:0")
if err != nil { if err != nil {
t.Fatalf("Unable to run test server: %v", err) t.Fatalf("unable to run test server: %v", err)
} }
defer s.Shutdown() defer s.Shutdown()
@ -121,7 +121,7 @@ func TestServing(t *testing.T) {
} }
txt := r.Extra[0].(*TXT).Txt[0] txt := r.Extra[0].(*TXT).Txt[0]
if txt != "Hello world" { if txt != "Hello world" {
t.Error("Unexpected result for miek.nl", txt, "!= Hello world") t.Error("unexpected result for miek.nl", txt, "!= Hello world")
} }
m.SetQuestion("example.com.", TypeTXT) m.SetQuestion("example.com.", TypeTXT)
@ -131,7 +131,7 @@ func TestServing(t *testing.T) {
} }
txt = r.Extra[0].(*TXT).Txt[0] txt = r.Extra[0].(*TXT).Txt[0]
if txt != "Hello example" { if txt != "Hello example" {
t.Error("Unexpected result for example.com", txt, "!= Hello example") t.Error("unexpected result for example.com", txt, "!= Hello example")
} }
// Test Mixes cased as noticed by Ask. // Test Mixes cased as noticed by Ask.
@ -142,7 +142,7 @@ func TestServing(t *testing.T) {
} }
txt = r.Extra[0].(*TXT).Txt[0] txt = r.Extra[0].(*TXT).Txt[0]
if txt != "Hello example" { if txt != "Hello example" {
t.Error("Unexpected result for example.com", txt, "!= Hello example") t.Error("unexpected result for example.com", txt, "!= Hello example")
} }
} }
@ -154,7 +154,7 @@ func BenchmarkServe(b *testing.B) {
s, addrstr, err := RunLocalUDPServer("127.0.0.1:0") s, addrstr, err := RunLocalUDPServer("127.0.0.1:0")
if err != nil { if err != nil {
b.Fatalf("Unable to run test server: %v", err) b.Fatalf("unable to run test server: %v", err)
} }
defer s.Shutdown() defer s.Shutdown()
@ -176,7 +176,7 @@ func benchmarkServe6(b *testing.B) {
a := runtime.GOMAXPROCS(4) a := runtime.GOMAXPROCS(4)
s, addrstr, err := RunLocalUDPServer("[::1]:0") s, addrstr, err := RunLocalUDPServer("[::1]:0")
if err != nil { if err != nil {
b.Fatalf("Unable to run test server: %v", err) b.Fatalf("unable to run test server: %v", err)
} }
defer s.Shutdown() defer s.Shutdown()
@ -207,7 +207,7 @@ func BenchmarkServeCompress(b *testing.B) {
a := runtime.GOMAXPROCS(4) a := runtime.GOMAXPROCS(4)
s, addrstr, err := RunLocalUDPServer("127.0.0.1:0") s, addrstr, err := RunLocalUDPServer("127.0.0.1:0")
if err != nil { if err != nil {
b.Fatalf("Unable to run test server: %v", err) b.Fatalf("unable to run test server: %v", err)
} }
defer s.Shutdown() defer s.Shutdown()
@ -308,7 +308,7 @@ func TestServingLargeResponses(t *testing.T) {
s, addrstr, err := RunLocalUDPServer("127.0.0.1:0") s, addrstr, err := RunLocalUDPServer("127.0.0.1:0")
if err != nil { if err != nil {
t.Fatalf("Unable to run test server: %v", err) t.Fatalf("unable to run test server: %v", err)
} }
defer s.Shutdown() defer s.Shutdown()
@ -348,7 +348,7 @@ func TestServingResponse(t *testing.T) {
HandleFunc("miek.nl.", HelloServer) HandleFunc("miek.nl.", HelloServer)
s, addrstr, err := RunLocalUDPServer("127.0.0.1:0") s, addrstr, err := RunLocalUDPServer("127.0.0.1:0")
if err != nil { if err != nil {
t.Fatalf("Unable to run test server: %v", err) t.Fatalf("unable to run test server: %v", err)
} }
c := new(Client) c := new(Client)
@ -368,7 +368,7 @@ func TestServingResponse(t *testing.T) {
s.Shutdown() s.Shutdown()
s, addrstr, err = RunLocalUDPServerUnsafe("127.0.0.1:0") s, addrstr, err = RunLocalUDPServerUnsafe("127.0.0.1:0")
if err != nil { if err != nil {
t.Fatalf("Unable to run test server: %v", err) t.Fatalf("unable to run test server: %v", err)
} }
defer s.Shutdown() defer s.Shutdown()
@ -382,11 +382,11 @@ func TestServingResponse(t *testing.T) {
func TestShutdownTCP(t *testing.T) { func TestShutdownTCP(t *testing.T) {
s, _, err := RunLocalTCPServer("127.0.0.1:0") s, _, err := RunLocalTCPServer("127.0.0.1:0")
if err != nil { if err != nil {
t.Fatalf("Unable to run test server: %v", err) t.Fatalf("unable to run test server: %v", err)
} }
err = s.Shutdown() err = s.Shutdown()
if err != nil { if err != nil {
t.Errorf("Could not shutdown test TCP server, %v", err) t.Errorf("could not shutdown test TCP server, %v", err)
} }
} }
@ -450,11 +450,11 @@ func TestHandlerCloseTCP(t *testing.T) {
func TestShutdownUDP(t *testing.T) { func TestShutdownUDP(t *testing.T) {
s, _, err := RunLocalUDPServer("127.0.0.1:0") s, _, err := RunLocalUDPServer("127.0.0.1:0")
if err != nil { if err != nil {
t.Fatalf("Unable to run test server: %v", err) t.Fatalf("unable to run test server: %v", err)
} }
err = s.Shutdown() err = s.Shutdown()
if err != nil { if err != nil {
t.Errorf("Could not shutdown test UDP server, %v", err) t.Errorf("could not shutdown test UDP server, %v", err)
} }
} }

View File

@ -28,7 +28,7 @@ func TestSIG0(t *testing.T) {
} }
pk, err := keyrr.Generate(keysize) pk, err := keyrr.Generate(keysize)
if err != nil { if err != nil {
t.Errorf("Failed to generate key for “%s”: %v", algstr, err) t.Errorf("failed to generate key for “%s”: %v", algstr, err)
continue continue
} }
now := uint32(time.Now().Unix()) now := uint32(time.Now().Unix())
@ -43,16 +43,16 @@ func TestSIG0(t *testing.T) {
sigrr.SignerName = keyrr.Hdr.Name sigrr.SignerName = keyrr.Hdr.Name
mb, err := sigrr.Sign(pk.(crypto.Signer), m) mb, err := sigrr.Sign(pk.(crypto.Signer), m)
if err != nil { if err != nil {
t.Errorf("Failed to sign message using “%s”: %v", algstr, err) t.Errorf("failed to sign message using “%s”: %v", algstr, err)
continue continue
} }
m := new(Msg) m := new(Msg)
if err := m.Unpack(mb); err != nil { if err := m.Unpack(mb); err != nil {
t.Errorf("Failed to unpack message signed using “%s”: %v", algstr, err) t.Errorf("failed to unpack message signed using “%s”: %v", algstr, err)
continue continue
} }
if len(m.Extra) != 1 { if len(m.Extra) != 1 {
t.Errorf("Missing SIG for message signed using “%s”", algstr) t.Errorf("missing SIG for message signed using “%s”", algstr)
continue continue
} }
var sigrrwire *SIG var sigrrwire *SIG
@ -60,7 +60,7 @@ func TestSIG0(t *testing.T) {
case *SIG: case *SIG:
sigrrwire = rr sigrrwire = rr
default: default:
t.Errorf("Expected SIG RR, instead: %v", rr) t.Errorf("expected SIG RR, instead: %v", rr)
continue continue
} }
for _, rr := range []*SIG{sigrr, sigrrwire} { for _, rr := range []*SIG{sigrr, sigrrwire} {
@ -69,20 +69,20 @@ func TestSIG0(t *testing.T) {
id = "sigrrwire" id = "sigrrwire"
} }
if err := rr.Verify(keyrr, mb); err != nil { if err := rr.Verify(keyrr, mb); err != nil {
t.Errorf("Failed to verify “%s” signed SIG(%s): %v", algstr, id, err) t.Errorf("failed to verify “%s” signed SIG(%s): %v", algstr, id, err)
continue continue
} }
} }
mb[13]++ mb[13]++
if err := sigrr.Verify(keyrr, mb); err == nil { if err := sigrr.Verify(keyrr, mb); err == nil {
t.Errorf("Verify succeeded on an altered message using “%s”", algstr) t.Errorf("verify succeeded on an altered message using “%s”", algstr)
continue continue
} }
sigrr.Expiration = 2 sigrr.Expiration = 2
sigrr.Inception = 1 sigrr.Inception = 1
mb, _ = sigrr.Sign(pk.(crypto.Signer), m) mb, _ = sigrr.Sign(pk.(crypto.Signer), m)
if err := sigrr.Verify(keyrr, mb); err == nil { if err := sigrr.Verify(keyrr, mb); err == nil {
t.Errorf("Verify succeeded on an expired message using “%s”", algstr) t.Errorf("verify succeeded on an expired message using “%s”", algstr)
continue continue
} }
} }

View File

@ -58,28 +58,28 @@ func TestRemoveRRset(t *testing.T) {
// for each set mentioned in the RRs provided to it. // for each set mentioned in the RRs provided to it.
rr, err := NewRR(". 100 IN A 127.0.0.1") rr, err := NewRR(". 100 IN A 127.0.0.1")
if err != nil { if err != nil {
t.Fatalf("Error constructing RR: %v", err) t.Fatalf("error constructing RR: %v", err)
} }
m := new(Msg) m := new(Msg)
m.Ns = []RR{&RR_Header{Name: ".", Rrtype: TypeA, Class: ClassANY, Ttl: 0, Rdlength: 0}} m.Ns = []RR{&RR_Header{Name: ".", Rrtype: TypeA, Class: ClassANY, Ttl: 0, Rdlength: 0}}
expectstr := m.String() expectstr := m.String()
expect, err := m.Pack() expect, err := m.Pack()
if err != nil { if err != nil {
t.Fatalf("Error packing expected msg: %v", err) t.Fatalf("error packing expected msg: %v", err)
} }
m.Ns = nil m.Ns = nil
m.RemoveRRset([]RR{rr}) m.RemoveRRset([]RR{rr})
actual, err := m.Pack() actual, err := m.Pack()
if err != nil { if err != nil {
t.Fatalf("Error packing actual msg: %v", err) t.Fatalf("error packing actual msg: %v", err)
} }
if !bytes.Equal(actual, expect) { if !bytes.Equal(actual, expect) {
tmp := new(Msg) tmp := new(Msg)
if err := tmp.Unpack(actual); err != nil { if err := tmp.Unpack(actual); err != nil {
t.Fatalf("Error unpacking actual msg: %v", err) t.Fatalf("error unpacking actual msg: %v", err)
} }
t.Errorf("Expected msg:\n%s", expectstr) t.Errorf("expected msg:\n%s", expectstr)
t.Errorf("Actual msg:\n%v", tmp) t.Errorf("actual msg:\n%v", tmp)
} }
} }

View File

@ -58,11 +58,11 @@ func TestAXFR_NLNL_MultipleEnvelopes(t *testing.T) {
tr := new(Transfer) tr := new(Transfer)
if a, err := tr.In(m, net.JoinHostPort(server, "53")); err != nil { if a, err := tr.In(m, net.JoinHostPort(server, "53")); err != nil {
t.Fatalf("Failed to setup axfr %v for server: %v", err, server) t.Fatalf("failed to setup axfr %v for server: %v", err, server)
} else { } else {
for ex := range a { for ex := range a {
if ex.Error != nil { if ex.Error != nil {
t.Errorf("Error %v", ex.Error) t.Errorf("error %v", ex.Error)
break break
} }
} }