mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2025-04-03 07:53:28 +03:00
2de42284a5
Merge in DNS/adguard-home from 5044-close-upstreams to master Closes #5044. Squashed commit of the following: commit e121380ecb32bd2664d47f0968c68509156404c1 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 19 15:54:17 2022 +0300 all: upd proxy again commit ce7fa539a7430a1a197fd45e7988697010c684db Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 19 14:30:46 2022 +0300 home: imp docs, names commit 851c5b8128149941cc469e6192ec9b4b1f92b0b5 Merge: b9ee5d63d2a09e49Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 19 14:21:44 2022 +0300 Merge branch 'master' into 5044-close-upstreams commit b9ee5d6348e696ff0b44dabee601469c545c8bd9 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 19 14:20:15 2022 +0300 all: close upstreams more commit eaca476319dc64e7986e26e67110005938cf1278 Merge: f924bc7a8dba4ecdAuthor: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Oct 18 18:33:53 2022 +0300 Merge branch 'master' into 5044-close-upstreams commit f924bc7a836001f8bb7463de2b5ddaf1be1a53c1 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Oct 18 18:23:54 2022 +0300 all: imp code, docs commit 011fde16aa912fc78e3d6f60375cee73a0d88709 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Oct 18 17:26:40 2022 +0300 all: upd dnsproxy
95 lines
2.1 KiB
Go
95 lines
2.1 KiB
Go
package dnssvc_test
|
|
|
|
import (
|
|
"context"
|
|
"net/netip"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/aghtest"
|
|
"github.com/AdguardTeam/AdGuardHome/internal/next/dnssvc"
|
|
"github.com/AdguardTeam/dnsproxy/upstream"
|
|
"github.com/AdguardTeam/golibs/errors"
|
|
"github.com/miekg/dns"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestMain(m *testing.M) {
|
|
aghtest.DiscardLogOutput(m)
|
|
}
|
|
|
|
// testTimeout is the common timeout for tests.
|
|
const testTimeout = 100 * time.Millisecond
|
|
|
|
func TestService(t *testing.T) {
|
|
const (
|
|
bootstrapAddr = "bootstrap.example"
|
|
upstreamAddr = "upstream.example"
|
|
|
|
closeErr errors.Error = "closing failed"
|
|
)
|
|
|
|
ups := &aghtest.UpstreamMock{
|
|
OnAddress: func() (addr string) {
|
|
return upstreamAddr
|
|
},
|
|
OnExchange: func(req *dns.Msg) (resp *dns.Msg, err error) {
|
|
resp = (&dns.Msg{}).SetReply(req)
|
|
|
|
return resp, nil
|
|
},
|
|
OnClose: func() (err error) {
|
|
return closeErr
|
|
},
|
|
}
|
|
|
|
c := &dnssvc.Config{
|
|
Addresses: []netip.AddrPort{netip.MustParseAddrPort("127.0.0.1:0")},
|
|
Upstreams: []upstream.Upstream{ups},
|
|
BootstrapServers: []string{bootstrapAddr},
|
|
UpstreamServers: []string{upstreamAddr},
|
|
UpstreamTimeout: testTimeout,
|
|
}
|
|
|
|
svc, err := dnssvc.New(c)
|
|
require.NoError(t, err)
|
|
|
|
err = svc.Start()
|
|
require.NoError(t, err)
|
|
|
|
gotConf := svc.Config()
|
|
require.NotNil(t, gotConf)
|
|
require.Len(t, gotConf.Addresses, 1)
|
|
|
|
addr := gotConf.Addresses[0]
|
|
|
|
t.Run("dns", func(t *testing.T) {
|
|
req := &dns.Msg{
|
|
MsgHdr: dns.MsgHdr{
|
|
Id: dns.Id(),
|
|
RecursionDesired: true,
|
|
},
|
|
Question: []dns.Question{{
|
|
Name: "example.com.",
|
|
Qtype: dns.TypeA,
|
|
Qclass: dns.ClassINET,
|
|
}},
|
|
}
|
|
|
|
ctx, cancel := context.WithTimeout(context.Background(), testTimeout)
|
|
defer cancel()
|
|
|
|
cli := &dns.Client{}
|
|
resp, _, excErr := cli.ExchangeContext(ctx, req, addr.String())
|
|
require.NoError(t, excErr)
|
|
|
|
assert.NotNil(t, resp)
|
|
})
|
|
|
|
ctx, cancel := context.WithTimeout(context.Background(), testTimeout)
|
|
defer cancel()
|
|
|
|
err = svc.Shutdown(ctx)
|
|
require.ErrorIs(t, err, closeErr)
|
|
}
|