mirror of
https://github.com/netbirdio/netbird.git
synced 2026-04-24 19:26:39 +00:00
Merge branch 'main' into feature/port-forwarding
This commit is contained in:
@@ -43,7 +43,7 @@ func TestGetDNSSettings(t *testing.T) {
|
||||
|
||||
account, err := initTestDNSAccount(t, am)
|
||||
if err != nil {
|
||||
t.Fatal("failed to init testing account")
|
||||
t.Fatalf("failed to init testing account: %s", err)
|
||||
}
|
||||
|
||||
dnsSettings, err := am.GetDNSSettings(context.Background(), account.Id, dnsAdminUserID)
|
||||
@@ -125,12 +125,12 @@ func TestSaveDNSSettings(t *testing.T) {
|
||||
t.Run(testCase.name, func(t *testing.T) {
|
||||
am, err := createDNSManager(t)
|
||||
if err != nil {
|
||||
t.Error("failed to create account manager")
|
||||
t.Fatalf("failed to create account manager")
|
||||
}
|
||||
|
||||
account, err := initTestDNSAccount(t, am)
|
||||
if err != nil {
|
||||
t.Error("failed to init testing account")
|
||||
t.Fatalf("failed to init testing account: %v", err)
|
||||
}
|
||||
|
||||
err = am.SaveDNSSettings(context.Background(), account.Id, testCase.userID, testCase.inputSettings)
|
||||
@@ -157,22 +157,22 @@ func TestGetNetworkMap_DNSConfigSync(t *testing.T) {
|
||||
|
||||
am, err := createDNSManager(t)
|
||||
if err != nil {
|
||||
t.Error("failed to create account manager")
|
||||
t.Fatalf("failed to create account manager: %s", err)
|
||||
}
|
||||
|
||||
account, err := initTestDNSAccount(t, am)
|
||||
if err != nil {
|
||||
t.Error("failed to init testing account")
|
||||
t.Fatalf("failed to init testing account: %s", err)
|
||||
}
|
||||
|
||||
peer1, err := account.FindPeerByPubKey(dnsPeer1Key)
|
||||
if err != nil {
|
||||
t.Error("failed to init testing account")
|
||||
t.Fatalf("failed to init testing account: %s", err)
|
||||
}
|
||||
|
||||
peer2, err := account.FindPeerByPubKey(dnsPeer2Key)
|
||||
if err != nil {
|
||||
t.Error("failed to init testing account")
|
||||
t.Fatalf("failed to init testing account: %s", err)
|
||||
}
|
||||
|
||||
newAccountDNSConfig, err := am.GetNetworkMap(context.Background(), peer1.ID)
|
||||
|
||||
Reference in New Issue
Block a user