Merge branch 'master' of github.com:miekg/dns
This commit is contained in:
commit
acee6af0bc
|
@ -595,7 +595,7 @@ func TestMsgPackBuffer(t *testing.T) {
|
|||
input, _ := hex.DecodeString(hexData)
|
||||
m := new(Msg)
|
||||
if e := m.Unpack(input); e != nil {
|
||||
t.Logf("packet %d failed to unpack")
|
||||
t.Logf("packet %d failed to unpack", i)
|
||||
t.Fail()
|
||||
continue
|
||||
}
|
||||
|
|
|
@ -105,7 +105,7 @@ func TestServing(t *testing.T) {
|
|||
r, _, err := c.Exchange(m, addrstr)
|
||||
if err != nil || len(r.Extra) == 0 {
|
||||
t.Log("failed to exchange miek.nl", err)
|
||||
t.Fatal()
|
||||
t.FailNow()
|
||||
}
|
||||
txt := r.Extra[0].(*TXT).Txt[0]
|
||||
if txt != "Hello world" {
|
||||
|
@ -117,7 +117,7 @@ func TestServing(t *testing.T) {
|
|||
r, _, err = c.Exchange(m, addrstr)
|
||||
if err != nil {
|
||||
t.Log("failed to exchange example.com", err)
|
||||
t.Fatal()
|
||||
t.FailNow()
|
||||
}
|
||||
txt = r.Extra[0].(*TXT).Txt[0]
|
||||
if txt != "Hello example" {
|
||||
|
@ -354,13 +354,13 @@ func TestServingResponse(t *testing.T) {
|
|||
_, _, err = c.Exchange(m, addrstr)
|
||||
if err != nil {
|
||||
t.Log("failed to exchange", err)
|
||||
t.Fatal()
|
||||
t.FailNow()
|
||||
}
|
||||
m.Response = true
|
||||
_, _, err = c.Exchange(m, addrstr)
|
||||
if err == nil {
|
||||
t.Log("exchanged response message")
|
||||
t.Fatal()
|
||||
t.FailNow()
|
||||
}
|
||||
|
||||
s.Shutdown()
|
||||
|
@ -374,7 +374,7 @@ func TestServingResponse(t *testing.T) {
|
|||
_, _, err = c.Exchange(m, addrstr)
|
||||
if err != nil {
|
||||
t.Log("could exchanged response message in Unsafe mode")
|
||||
t.Fatal()
|
||||
t.FailNow()
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -29,7 +29,7 @@ func testClientAXFR(t *testing.T) {
|
|||
|
||||
if a, err := tr.In(m, net.JoinHostPort(server, "53")); err != nil {
|
||||
t.Log("failed to setup axfr: " + err.Error())
|
||||
t.Fatal()
|
||||
t.FailNow()
|
||||
} else {
|
||||
for ex := range a {
|
||||
if ex.Error != nil {
|
||||
|
@ -82,7 +82,7 @@ func testClientTsigAXFR(t *testing.T) {
|
|||
|
||||
if a, err := tr.In(m, "176.58.119.54:53"); err != nil {
|
||||
t.Log("failed to setup axfr: " + err.Error())
|
||||
t.Fatal()
|
||||
t.FailNow()
|
||||
} else {
|
||||
for ex := range a {
|
||||
if ex.Error != nil {
|
||||
|
|
Loading…
Reference in New Issue