mirror of
https://github.com/coredns/coredns.git
synced 2026-09-03 18:47:05 -04:00
test: fix flaky tests that don't check dns.Exchange response is non-nil (#8501)
dns.Exchange may return nil on error. Signed-off-by: Ilya Kulakov <kulakov.ilya@gmail.com>
This commit is contained in:
@@ -212,7 +212,7 @@ func TestSecondaryZoneTransfer(t *testing.T) {
|
|||||||
// This is now async; we need to wait for it to be transferred.
|
// This is now async; we need to wait for it to be transferred.
|
||||||
for range 10 {
|
for range 10 {
|
||||||
r, _ = dns.Exchange(m, udp)
|
r, _ = dns.Exchange(m, udp)
|
||||||
if len(r.Answer) != 0 {
|
if r != nil && len(r.Answer) != 0 {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
time.Sleep(100 * time.Microsecond)
|
time.Sleep(100 * time.Microsecond)
|
||||||
@@ -424,7 +424,7 @@ func TestSecondaryZoneNotify(t *testing.T) {
|
|||||||
// This is now async; we need to wait for it to be transferred.
|
// This is now async; we need to wait for it to be transferred.
|
||||||
for range 10 {
|
for range 10 {
|
||||||
r, _ = dns.Exchange(m, udp)
|
r, _ = dns.Exchange(m, udp)
|
||||||
if len(r.Answer) != 0 {
|
if r != nil && len(r.Answer) != 0 {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
time.Sleep(100 * time.Millisecond)
|
time.Sleep(100 * time.Millisecond)
|
||||||
@@ -436,7 +436,7 @@ func TestSecondaryZoneNotify(t *testing.T) {
|
|||||||
m = new(dns.Msg)
|
m = new(dns.Msg)
|
||||||
m.SetQuestion("www.example.org.", dns.TypeA)
|
m.SetQuestion("www.example.org.", dns.TypeA)
|
||||||
r, _ = dns.Exchange(m, udp)
|
r, _ = dns.Exchange(m, udp)
|
||||||
if len(r.Answer) != 0 {
|
if r != nil && len(r.Answer) != 0 {
|
||||||
t.Fatalf("Expected no answer section, got %d answers", len(r.Answer))
|
t.Fatalf("Expected no answer section, got %d answers", len(r.Answer))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -457,7 +457,7 @@ www IN A 127.0.0.1
|
|||||||
// This is now async; we need to wait for it to be transferred.
|
// This is now async; we need to wait for it to be transferred.
|
||||||
for range 10 {
|
for range 10 {
|
||||||
r, _ = dns.Exchange(m, udp)
|
r, _ = dns.Exchange(m, udp)
|
||||||
if len(r.Answer) != 0 {
|
if r != nil && len(r.Answer) != 0 {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
time.Sleep(100 * time.Millisecond)
|
time.Sleep(100 * time.Millisecond)
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ func TestClasslessReverse(t *testing.T) {
|
|||||||
|
|
||||||
r, e := dns.Exchange(m, udp)
|
r, e := dns.Exchange(m, udp)
|
||||||
if e != nil {
|
if e != nil {
|
||||||
t.Errorf("Test %d, expected no error, got %q", i, e)
|
t.Fatalf("Test %d, expected no error, got %q", i, e)
|
||||||
}
|
}
|
||||||
if r.Rcode != tc.rcode {
|
if r.Rcode != tc.rcode {
|
||||||
t.Errorf("Test %d, expected %d, got %d for %s", i, tc.rcode, r.Rcode, tc.addr)
|
t.Errorf("Test %d, expected %d, got %d for %s", i, tc.rcode, r.Rcode, tc.addr)
|
||||||
@@ -86,7 +86,7 @@ func TestReverse(t *testing.T) {
|
|||||||
|
|
||||||
r, e := dns.Exchange(m, udp)
|
r, e := dns.Exchange(m, udp)
|
||||||
if e != nil {
|
if e != nil {
|
||||||
t.Errorf("Test %d, expected no error, got %q", i, e)
|
t.Fatalf("Test %d, expected no error, got %q", i, e)
|
||||||
}
|
}
|
||||||
if r.Rcode != tc.rcode {
|
if r.Rcode != tc.rcode {
|
||||||
t.Errorf("Test %d, expected %d, got %d for %s", i, tc.rcode, r.Rcode, tc.addr)
|
t.Errorf("Test %d, expected %d, got %d for %s", i, tc.rcode, r.Rcode, tc.addr)
|
||||||
@@ -132,7 +132,7 @@ func TestReverseInAddr(t *testing.T) {
|
|||||||
|
|
||||||
r, e := dns.Exchange(m, udp)
|
r, e := dns.Exchange(m, udp)
|
||||||
if e != nil {
|
if e != nil {
|
||||||
t.Errorf("Test %d, expected no error, got %q", i, e)
|
t.Fatalf("Test %d, expected no error, got %q", i, e)
|
||||||
}
|
}
|
||||||
if r.Rcode != tc.rcode {
|
if r.Rcode != tc.rcode {
|
||||||
t.Errorf("Test %d, expected %d, got %d for %s", i, tc.rcode, r.Rcode, tc.addr)
|
t.Errorf("Test %d, expected %d, got %d for %s", i, tc.rcode, r.Rcode, tc.addr)
|
||||||
|
|||||||
Reference in New Issue
Block a user