From ac796cd723c77da22051ea2e7bba6c89ce2ae4f0 Mon Sep 17 00:00:00 2001 From: Ilya Kulakov Date: Mon, 31 Aug 2026 22:55:17 -0700 Subject: [PATCH] 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 --- test/secondary_test.go | 8 ++++---- test/server_reverse_test.go | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/secondary_test.go b/test/secondary_test.go index 7e8134955..1dd7e82c7 100644 --- a/test/secondary_test.go +++ b/test/secondary_test.go @@ -212,7 +212,7 @@ func TestSecondaryZoneTransfer(t *testing.T) { // This is now async; we need to wait for it to be transferred. for range 10 { r, _ = dns.Exchange(m, udp) - if len(r.Answer) != 0 { + if r != nil && len(r.Answer) != 0 { break } 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. for range 10 { r, _ = dns.Exchange(m, udp) - if len(r.Answer) != 0 { + if r != nil && len(r.Answer) != 0 { break } time.Sleep(100 * time.Millisecond) @@ -436,7 +436,7 @@ func TestSecondaryZoneNotify(t *testing.T) { m = new(dns.Msg) m.SetQuestion("www.example.org.", dns.TypeA) 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)) } @@ -457,7 +457,7 @@ www IN A 127.0.0.1 // This is now async; we need to wait for it to be transferred. for range 10 { r, _ = dns.Exchange(m, udp) - if len(r.Answer) != 0 { + if r != nil && len(r.Answer) != 0 { break } time.Sleep(100 * time.Millisecond) diff --git a/test/server_reverse_test.go b/test/server_reverse_test.go index 4d69b1b0e..8a70d9bf4 100644 --- a/test/server_reverse_test.go +++ b/test/server_reverse_test.go @@ -40,7 +40,7 @@ func TestClasslessReverse(t *testing.T) { r, e := dns.Exchange(m, udp) 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 { 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) 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 { 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) 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 { t.Errorf("Test %d, expected %d, got %d for %s", i, tc.rcode, r.Rcode, tc.addr)