a/badguardhome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix merge issues

Browse Source
This commit is contained in:
Aleksey Dmitrevskiy 2019-02-25 17:07:26 +03:00
parent d351ed82c1
commit 3d901a82ad
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dnsforward/dnsforward_test.go
View File

@ -16,7 +16,6 @@ import (
"time" "time"
"github.com/AdguardTeam/dnsproxy/proxy" "github.com/AdguardTeam/dnsproxy/proxy"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/AdguardTeam/AdGuardHome/dnsfilter" "github.com/AdguardTeam/AdGuardHome/dnsfilter"
@ -482,7 +481,7 @@ func sendTestMessageAsync(t *testing.T, conn *dns.Conn, g *sync.WaitGroup) {
g.Done() g.Done()
}() }()
req := createTestMessage() req := createGoogleATestMessage()
err := conn.WriteMsg(req) err := conn.WriteMsg(req)
if err != nil { if err != nil {
t.Fatalf("cannot write message: %s", err) t.Fatalf("cannot write message: %s", err)
@ -492,7 +491,7 @@ func sendTestMessageAsync(t *testing.T, conn *dns.Conn, g *sync.WaitGroup) {
if err != nil { if err != nil {
t.Fatalf("cannot read response to message: %s", err) t.Fatalf("cannot read response to message: %s", err)
} }
assertResponse(t, res) assertGoogleAResponse(t, res)
} }
// sendTestMessagesAsync sends messages in parallel // sendTestMessagesAsync sends messages in parallel
@ -510,7 +509,7 @@ func sendTestMessagesAsync(t *testing.T, conn *dns.Conn) {
func sendTestMessages(t *testing.T, conn *dns.Conn) { func sendTestMessages(t *testing.T, conn *dns.Conn) {
for i := 0; i < 10; i++ { for i := 0; i < 10; i++ {
req := createTestMessage() req := createGoogleATestMessage()
err := conn.WriteMsg(req) err := conn.WriteMsg(req)
if err != nil { if err != nil {
t.Fatalf("cannot write message #%d: %s", i, err) t.Fatalf("cannot write message #%d: %s", i, err)
@ -520,7 +519,7 @@ func sendTestMessages(t *testing.T, conn *dns.Conn) {
if err != nil { if err != nil {
t.Fatalf("cannot read response to message #%d: %s", i, err) t.Fatalf("cannot read response to message #%d: %s", i, err)
} }
assertResponse(t, res) assertGoogleAResponse(t, res)
} }
} }