From efabbe318e7520eba65b595f11e2fb8effaeec13 Mon Sep 17 00:00:00 2001 From: Stanislav Chzhen Date: Fri, 22 Nov 2024 19:36:27 +0300 Subject: [PATCH] dnsforward: fix safesearch test --- internal/dnsforward/dnsforward_test.go | 29 ++++++++++++++++---------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/internal/dnsforward/dnsforward_test.go b/internal/dnsforward/dnsforward_test.go index 548c79da..798da17c 100644 --- a/internal/dnsforward/dnsforward_test.go +++ b/internal/dnsforward/dnsforward_test.go @@ -536,10 +536,24 @@ func TestSafeSearch(t *testing.T) { ServePlainDNS: true, } s := createTestServer(t, filterConf, forwardConf) - startDeferStop(t, s) + ups := aghtest.NewUpstreamMock(func(req *dns.Msg) (resp *dns.Msg, err error) { + resp = new(dns.Msg).SetReply(req) + resp.Answer = []dns.RR{&dns.A{ + Hdr: dns.RR_Header{ + Name: req.Question[0].Name, + Rrtype: dns.TypeA, + Class: dns.ClassINET, + Ttl: 60, + }, + A: []byte{1, 2, 3, 4}, + }} + return resp, nil + }) + s.conf.UpstreamConfig.Upstreams = []upstream.Upstream{ups} + + startDeferStop(t, s) addr := s.dnsProxy.Addr(proxy.ProtoUDP).String() - client := &dns.Client{} yandexIP := netip.AddrFrom4([4]byte{213, 180, 193, 56}) @@ -587,15 +601,8 @@ func TestSafeSearch(t *testing.T) { // TODO(a.garipov): Create our own helper for this. var reply *dns.Msg - once := &sync.Once{} - require.EventuallyWithT(t, func(c *assert.CollectT) { - r, _, errExch := client.Exchange(req, addr) - if assert.NoError(c, errExch) { - once.Do(func() { reply = r }) - } else { - t.Logf("got error: %v", errExch) - } - }, testTimeout*10, testTimeout) + reply, err = dns.Exchange(req, addr) + require.NoError(t, err) if tc.wantCNAME != "" { require.Len(t, reply.Answer, 2)