mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-22 21:15:35 +03:00
137d280032
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values
68 lines
1.8 KiB
Go
68 lines
1.8 KiB
Go
package websvc_test
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"net/http"
|
|
"net/netip"
|
|
"net/url"
|
|
"sync/atomic"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/aghtest"
|
|
"github.com/AdguardTeam/AdGuardHome/internal/next/agh"
|
|
"github.com/AdguardTeam/AdGuardHome/internal/next/dnssvc"
|
|
"github.com/AdguardTeam/AdGuardHome/internal/next/websvc"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestService_HandlePatchSettingsDNS(t *testing.T) {
|
|
wantDNS := &websvc.HTTPAPIDNSSettings{
|
|
Addresses: []netip.AddrPort{netip.MustParseAddrPort("127.0.1.1:53")},
|
|
BootstrapServers: []string{"1.0.0.1"},
|
|
UpstreamServers: []string{"1.1.1.1"},
|
|
UpstreamTimeout: websvc.JSONDuration(2 * time.Second),
|
|
}
|
|
|
|
var started atomic.Bool
|
|
confMgr := newConfigManager()
|
|
confMgr.onDNS = func() (s agh.ServiceWithConfig[*dnssvc.Config]) {
|
|
return &aghtest.ServiceWithConfig[*dnssvc.Config]{
|
|
OnStart: func() (err error) {
|
|
started.Store(true)
|
|
|
|
return nil
|
|
},
|
|
OnShutdown: func(_ context.Context) (err error) { panic("not implemented") },
|
|
OnConfig: func() (c *dnssvc.Config) { panic("not implemented") },
|
|
}
|
|
}
|
|
confMgr.onUpdateDNS = func(ctx context.Context, c *dnssvc.Config) (err error) {
|
|
return nil
|
|
}
|
|
|
|
_, addr := newTestServer(t, confMgr)
|
|
u := &url.URL{
|
|
Scheme: "http",
|
|
Host: addr.String(),
|
|
Path: websvc.PathV1SettingsDNS,
|
|
}
|
|
|
|
req := jobj{
|
|
"addresses": wantDNS.Addresses,
|
|
"bootstrap_servers": wantDNS.BootstrapServers,
|
|
"upstream_servers": wantDNS.UpstreamServers,
|
|
"upstream_timeout": wantDNS.UpstreamTimeout,
|
|
}
|
|
|
|
respBody := httpPatch(t, u, req, http.StatusOK)
|
|
resp := &websvc.HTTPAPIDNSSettings{}
|
|
err := json.Unmarshal(respBody, resp)
|
|
require.NoError(t, err)
|
|
|
|
assert.True(t, started.Load())
|
|
assert.Equal(t, wantDNS, resp)
|
|
assert.Equal(t, wantDNS, resp)
|
|
}
|