Fix the testcode

This commit is contained in:
Miek Gieben 2012-05-20 12:44:49 +02:00
parent 983d979698
commit e11c077112

View File

@ -10,7 +10,7 @@ func TestClientSync(t *testing.T) {
m.SetQuestion("miek.nl.", TypeSOA) m.SetQuestion("miek.nl.", TypeSOA)
c := NewClient() c := NewClient()
r, _:= c.Exchange(m, "85.223.71.124:53") r, _ := c.Exchange(m, "85.223.71.124:53")
if r != nil && r.Rcode != RcodeSuccess { if r != nil && r.Rcode != RcodeSuccess {
t.Log("Failed to get an valid answer") t.Log("Failed to get an valid answer")
@ -70,32 +70,29 @@ func TestClientEDNS0(t *testing.T) {
func TestClientTsigAXFR(t *testing.T) { func TestClientTsigAXFR(t *testing.T) {
m := new(Msg) m := new(Msg)
m.SetAxfr("miek.nl.") m.SetAxfr("miek.nl.")
m.SetTsig("axfr.", HmacMD5, 300, m.MsgHdr.Id, time.Now().Unix()) m.SetTsig("axfr.", HmacMD5, 300, time.Now().Unix())
c := NewClient() c := NewClient()
c.TsigSecret = map[string]string{"axfr.": "so6ZGir4GPAqINNh9U5c3A=="} c.TsigSecret = map[string]string{"axfr.": "so6ZGir4GPAqINNh9U5c3A=="}
c.Net = "tcp" c.Net = "tcp"
if err := c.XfrReceive(m, "85.223.71.124:53"); err != nil { if a, err := c.XfrReceive(m, "85.223.71.124:53"); err != nil {
t.Log("Failed to setup axfr" + err.Error()) t.Log("Failed to setup axfr" + err.Error())
t.Fail() t.Fail()
return return
} } else {
for { for ex := range a {
ex := <-c.ReplyChan t.Log(ex.Reply.String())
t.Log(ex.Reply.String()) if ex.Error != nil {
if ex.Error == ErrXfrLast { t.Logf("Error %s\n", ex.Error.Error())
break t.Fail()
break
}
if ex.Reply.Rcode != RcodeSuccess {
break
}
t.Logf("%s\n", ex.Reply.String())
} }
if ex.Error != nil {
t.Logf("Error %s\n", ex.Error.Error())
t.Fail()
break
}
if ex.Reply.Rcode != RcodeSuccess {
break
}
t.Logf("%s\n", ex.Reply.String())
} }
} }
@ -107,24 +104,21 @@ func TestClientAXFRMultipleMessages(t *testing.T) {
c.Net = "tcp" c.Net = "tcp"
// timeout? // timeout?
if err := c.XfrReceive(m, "85.223.71.124:53"); err != nil { if a, err := c.XfrReceive(m, "85.223.71.124:53"); err != nil {
t.Log("Failed to setup axfr" + err.Error()) t.Log("Failed to setup axfr" + err.Error())
t.Fail() t.Fail()
return return
} } else {
for { for ex := range a {
ex := <-c.ReplyChan t.Log(ex.Reply.String())
t.Log(ex.Reply.String()) if ex.Error != nil {
if ex.Error == ErrXfrLast { t.Logf("Error %s\n", ex.Error.Error())
break t.Fail()
} break
if ex.Error != nil { }
t.Logf("Error %s\n", ex.Error.Error()) if ex.Reply.Rcode != RcodeSuccess {
t.Fail() break
break }
}
if ex.Reply.Rcode != RcodeSuccess {
break
} }
} }
} }