docstring_tokens stringlengths 0 76.5k | code_tokens stringlengths 75 1.81M | label_window listlengths 4 2.12k | html_url stringlengths 74 116 | file_name stringlengths 3 311 |
|---|---|---|---|---|
require.Nilf(t, err, "couldn't talk to server %s: %s", addr, err)
require.Lenf(t, reply.Answer, 1, "dns server %s returned reply with wrong number of answers - %d", addr, len(reply.Answer)) | <mask> // SafeBrowsing blocking.
<mask> req := createTestMessage(hostname + ".")
<mask>
<mask> reply, err := dns.Exchange(req, addr.String())
<mask> assert.Nilf(t, err, "couldn't talk to server %s: %s", addr, err)
<mask> assert.Lenf(t, reply.Answer, 1, "dns server %s returned reply with wrong number of answers - %d", addr, len(reply.Answer))
<mask>
<mask> a, ok := reply.Answer[0].(*dns.A)
<mask> if assert.Truef(t, ok, "dns server %s returned wrong answer type instead of A: %v", addr, reply.Answer[0]) {
<mask> assert.Equal(t, ans, a.A, "dns server %s returned wrong answer: %v", addr, a.A)
<mask> }
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.Nilf(t, err, "couldn't talk to server %s: %s", addr, err)
assert.Lenf(t, reply.Answer, 1, "dns server %s returned reply with wrong number of answers - %d", addr, len(reply.Answer))
</s> add require.Nilf(t, err, "couldn't talk to server %s: %s", addr, err)
require.Lenf(t, reply.Answer, 1, "dns server %s returned reply with wrong number of answers - %d", addr, len(reply.Answer)) </s> remove if assert.Truef(t, ok, "dns server %s returned wrong answer type instead of A: %v", addr, reply.Answer[0]) {
assert.Equal(t, ans, a.A, "dns server %s returned wrong answer: %v", addr, a.A)
}
</s> add require.Truef(t, ok, "dns server %s returned wrong answer type instead of A: %v", addr, reply.Answer[0])
assert.Equal(t, ans4, a.A, "dns server %s returned wrong answer: %v", addr, a.A) </s> remove assert.Nilf(t, err, "couldn't talk to server %s: %s", addr, err)
assert.Lenf(t, reply.Answer, 1, "dns server %s returned reply with wrong number of answers - %d", addr, len(reply.Answer))
</s> add require.Nilf(t, err, "couldn't talk to server %s: %s", addr, err)
require.Lenf(t, reply.Answer, 1, "dns server %s returned reply with wrong number of answers - %d", addr, len(reply.Answer)) </s> remove assert.Truef(t, ok, "dns server %s returned wrong answer type instead of A: %v", addr, reply.Answer[0])
</s> add require.Truef(t, ok, "dns server %s returned wrong answer type instead of A: %v", addr, reply.Answer[0]) </s> remove assert.Truef(t, ok, "dns server %s returned wrong answer type instead of A: %v", addr, reply.Answer[0])
</s> add require.Truef(t, ok, "dns server %s returned wrong answer type instead of A: %v", addr, reply.Answer[0]) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/dnsforward_test.go |
require.Truef(t, ok, "dns server %s returned wrong answer type instead of A: %v", addr, reply.Answer[0])
assert.Equal(t, ans4, a.A, "dns server %s returned wrong answer: %v", addr, a.A) | <mask> assert.Nilf(t, err, "couldn't talk to server %s: %s", addr, err)
<mask> assert.Lenf(t, reply.Answer, 1, "dns server %s returned reply with wrong number of answers - %d", addr, len(reply.Answer))
<mask>
<mask> a, ok := reply.Answer[0].(*dns.A)
<mask> if assert.Truef(t, ok, "dns server %s returned wrong answer type instead of A: %v", addr, reply.Answer[0]) {
<mask> assert.Equal(t, ans, a.A, "dns server %s returned wrong answer: %v", addr, a.A)
<mask> }
<mask> }
<mask>
<mask> func TestRewrite(t *testing.T) {
<mask> c := &dnsfilter.Config{
<mask> Rewrites: []dnsfilter.RewriteEntry{{
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.Nilf(t, err, "couldn't talk to server %s: %s", addr, err)
assert.Lenf(t, reply.Answer, 1, "dns server %s returned reply with wrong number of answers - %d", addr, len(reply.Answer))
</s> add require.Nilf(t, err, "couldn't talk to server %s: %s", addr, err)
require.Lenf(t, reply.Answer, 1, "dns server %s returned reply with wrong number of answers - %d", addr, len(reply.Answer)) </s> remove assert.Nilf(t, err, "couldn't talk to server %s: %s", addr, err)
assert.Lenf(t, reply.Answer, 1, "dns server %s returned reply with wrong number of answers - %d", addr, len(reply.Answer))
</s> add require.Nilf(t, err, "couldn't talk to server %s: %s", addr, err)
require.Lenf(t, reply.Answer, 1, "dns server %s returned reply with wrong number of answers - %d", addr, len(reply.Answer)) </s> remove assert.Truef(t, ok, "dns server %s returned wrong answer type instead of A: %v", addr, reply.Answer[0])
</s> add require.Truef(t, ok, "dns server %s returned wrong answer type instead of A: %v", addr, reply.Answer[0]) </s> remove assert.Truef(t, ok, "dns server %s returned wrong answer type instead of A: %v", addr, reply.Answer[0])
</s> add require.Truef(t, ok, "dns server %s returned wrong answer type instead of A: %v", addr, reply.Answer[0]) </s> remove assert.Nilf(t, err, "couldn't talk to server %s: %s", addr, err)
assert.Lenf(t, reply.Answer, 1, "dns server %s returned reply with wrong number of answers - %d", addr, len(reply.Answer))
</s> add require.Nilf(t, err, "couldn't talk to server %s: %s", addr, err)
require.Lenf(t, reply.Answer, 1, "dns server %s returned reply with wrong number of answers - %d", addr, len(reply.Answer)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/dnsforward_test.go |
assert.Nil(t, s.Prepare(&ServerConfig{ | <mask> }
<mask> f := dnsfilter.New(c, nil)
<mask>
<mask> s := NewServer(DNSCreateParams{DNSFilter: f})
<mask> err := s.Prepare(&ServerConfig{
<mask> UDPListenAddr: &net.UDPAddr{},
<mask> TCPListenAddr: &net.TCPAddr{},
<mask> FilteringConfig: FilteringConfig{
<mask> ProtectionEnabled: true,
<mask> UpstreamDNS: []string{"8.8.8.8:53"},
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove SafeBrowsingBlockHost: ans.String(),
</s> add SafeBrowsingBlockHost: ans4.String(), </s> remove conf := ServerConfig{
</s> add conf := &ServerConfig{ </s> remove })
</s> add })) </s> remove // download
</s> add // Download. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/dnsforward_test.go |
})) | <mask> FilteringConfig: FilteringConfig{
<mask> ProtectionEnabled: true,
<mask> UpstreamDNS: []string{"8.8.8.8:53"},
<mask> },
<mask> })
<mask> s.conf.UpstreamConfig.Upstreams = []upstream.Upstream{
<mask> &aghtest.TestUpstream{
<mask> CName: map[string]string{
<mask> "example.org": "somename",
<mask> },
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove err := s.Prepare(&ServerConfig{
</s> add assert.Nil(t, s.Prepare(&ServerConfig{ </s> remove SafeBrowsingBlockHost: ans.String(),
</s> add SafeBrowsingBlockHost: ans4.String(), </s> remove conf := ServerConfig{
</s> add conf := &ServerConfig{ </s> remove assert.NotNil(t, s.Prepare(&conf))
</s> add assert.NotNil(t, s.Prepare(conf)) </s> remove }) == nil)
// match by "host2.com"
assert.True(t, a.IsBlockedDomain("host1"))
assert.True(t, a.IsBlockedDomain("host2"))
assert.False(t, a.IsBlockedDomain("host3"))
// match by wildcard "*.host.com"
assert.False(t, a.IsBlockedDomain("host.com"))
assert.True(t, a.IsBlockedDomain("asdf.host.com"))
assert.True(t, a.IsBlockedDomain("qwer.asdf.host.com"))
assert.False(t, a.IsBlockedDomain("asdf.zhost.com"))
// match by wildcard "||host3.com^"
assert.True(t, a.IsBlockedDomain("host3.com"))
assert.True(t, a.IsBlockedDomain("asdf.host3.com"))
</s> add }))
testCases := []struct {
name string
domain string
want bool
}{{
name: "plain_match",
domain: "host1",
want: true,
}, {
name: "plain_mismatch",
domain: "host2",
want: false,
}, {
name: "wildcard_type-1_match_short",
domain: "asdf.host.com",
want: true,
}, {
name: "wildcard_type-1_match_long",
domain: "qwer.asdf.host.com",
want: true,
}, {
name: "wildcard_type-1_mismatch_no-lead",
domain: "host.com",
want: false,
}, {
name: "wildcard_type-1_mismatch_bad-asterisk",
domain: "asdf.zhost.com",
want: false,
}, {
name: "wildcard_type-2_match_simple",
domain: "host3.com",
want: true,
}, {
name: "wildcard_type-2_match_complex",
domain: "asdf.host3.com",
want: true,
}, {
name: "wildcard_type-2_mismatch",
domain: ".host3.com",
want: false,
}}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
assert.Equal(t, tc.want, aCtx.IsBlockedDomain(tc.domain))
})
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/dnsforward_test.go |
<mask> "example.org.": {{4, 3, 2, 1}},
<mask> },
<mask> },
<mask> }
<mask> assert.Nil(t, err)
<mask> startDeferStop(t, s)
<mask>
<mask> addr := s.dnsProxy.Addr(proxy.ProtoUDP)
<mask>
<mask> req := createTestMessageWithType("test.com.", dns.TypeA)
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.Nil(t, err)
assert.Len(t, reply.Answer, 1)
</s> add require.Nil(t, err)
require.Len(t, reply.Answer, 1) </s> remove assert.Nil(t, s.Prepare(&conf))
</s> add require.Nil(t, s.Prepare(conf)) </s> remove err := s.startWithUpstream(testUpstm)
assert.Nil(t, err)
</s> add s.dnsProxy.UpstreamConfig = &proxy.UpstreamConfig{
Upstreams: []upstream.Upstream{testUpstm},
}
startDeferStop(t, s)
</s> remove r = d.processRewrites("www.host.com", dns.TypeA)
assert.Equal(t, Rewritten, r.Reason)
assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 5}))
</s> add testCases := []struct {
name string
host string
dtyp uint16
wantCName string
wantVals []net.IP
}{{
name: "not_filtered_not_found",
host: "hoost.com",
dtyp: dns.TypeA,
}, {
name: "rewritten_a",
host: "www.host.com",
dtyp: dns.TypeA,
wantCName: "host.com",
wantVals: []net.IP{{1, 2, 3, 4}, {1, 2, 3, 5}},
}, {
name: "rewritten_aaaa",
host: "www.host.com",
dtyp: dns.TypeAAAA,
wantCName: "host.com",
wantVals: []net.IP{net.ParseIP("1:2:3::4")},
}, {
name: "wildcard_match",
host: "abc.host.com",
dtyp: dns.TypeA,
wantVals: []net.IP{{1, 2, 3, 5}},
}, {
name: "wildcard_override",
host: "a.host.com",
dtyp: dns.TypeA,
wantVals: []net.IP{{1, 2, 3, 4}},
}, {
name: "wildcard_cname_interaction",
host: "www.host2.com",
dtyp: dns.TypeA,
wantCName: "host.com",
wantVals: []net.IP{{1, 2, 3, 4}, {1, 2, 3, 5}},
}, {
name: "two_cnames",
host: "b.host.com",
dtyp: dns.TypeA,
wantCName: "somehost.com",
wantVals: []net.IP{{0, 0, 0, 0}},
}, {
name: "two_cnames_and_wildcard",
host: "b.host3.com",
dtyp: dns.TypeA,
wantCName: "x.host.com",
wantVals: []net.IP{{1, 2, 3, 5}},
}} </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/dnsforward_test.go | |
require.Nil(t, err)
require.Len(t, reply.Answer, 1) | <mask> addr := s.dnsProxy.Addr(proxy.ProtoUDP)
<mask>
<mask> req := createTestMessageWithType("test.com.", dns.TypeA)
<mask> reply, err := dns.Exchange(req, addr.String())
<mask> assert.Nil(t, err)
<mask> assert.Len(t, reply.Answer, 1)
<mask> a, ok := reply.Answer[0].(*dns.A)
<mask> assert.True(t, ok)
<mask> assert.True(t, net.IP{1, 2, 3, 4}.Equal(a.A))
<mask>
<mask> req = createTestMessageWithType("test.com.", dns.TypeAAAA)
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.True(t, ok)
</s> add require.True(t, ok) </s> remove assert.Nil(t, err)
assert.Len(t, reply.Answer, 1)
</s> add require.Nil(t, err)
require.Len(t, reply.Answer, 1) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove assert.True(t, ok)
</s> add require.True(t, ok) </s> remove assert.Nil(t, err)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/dnsforward_test.go |
require.True(t, ok) | <mask> reply, err := dns.Exchange(req, addr.String())
<mask> assert.Nil(t, err)
<mask> assert.Len(t, reply.Answer, 1)
<mask> a, ok := reply.Answer[0].(*dns.A)
<mask> assert.True(t, ok)
<mask> assert.True(t, net.IP{1, 2, 3, 4}.Equal(a.A))
<mask>
<mask> req = createTestMessageWithType("test.com.", dns.TypeAAAA)
<mask> reply, err = dns.Exchange(req, addr.String())
<mask> assert.Nil(t, err)
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.Nil(t, err)
assert.Len(t, reply.Answer, 1)
</s> add require.Nil(t, err)
require.Len(t, reply.Answer, 1) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove assert.True(t, ok)
</s> add require.True(t, ok) </s> remove assert.Nil(t, err)
assert.Len(t, reply.Answer, 1)
</s> add require.Nil(t, err)
require.Len(t, reply.Answer, 1) </s> remove assert.Nil(t, err)
assert.Len(t, reply.Answer, 2)
</s> add require.Nil(t, err)
require.Len(t, reply.Answer, 2) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/dnsforward_test.go |
require.Nil(t, err) | <mask> assert.True(t, net.IP{1, 2, 3, 4}.Equal(a.A))
<mask>
<mask> req = createTestMessageWithType("test.com.", dns.TypeAAAA)
<mask> reply, err = dns.Exchange(req, addr.String())
<mask> assert.Nil(t, err)
<mask> assert.Empty(t, reply.Answer)
<mask>
<mask> req = createTestMessageWithType("alias.test.com.", dns.TypeA)
<mask> reply, err = dns.Exchange(req, addr.String())
<mask> assert.Nil(t, err)
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.Nil(t, err)
assert.Len(t, reply.Answer, 2)
</s> add require.Nil(t, err)
require.Len(t, reply.Answer, 2) </s> remove assert.True(t, ok)
</s> add require.True(t, ok) </s> remove assert.Nil(t, err)
assert.Len(t, reply.Answer, 1)
</s> add require.Nil(t, err)
require.Len(t, reply.Answer, 1) </s> remove assert.True(t, ok)
</s> add require.True(t, ok) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/dnsforward_test.go |
require.Nil(t, err)
require.Len(t, reply.Answer, 2) | <mask> assert.Empty(t, reply.Answer)
<mask>
<mask> req = createTestMessageWithType("alias.test.com.", dns.TypeA)
<mask> reply, err = dns.Exchange(req, addr.String())
<mask> assert.Nil(t, err)
<mask> assert.Len(t, reply.Answer, 2)
<mask> assert.Equal(t, "test.com.", reply.Answer[0].(*dns.CNAME).Target)
<mask> assert.True(t, net.IP{1, 2, 3, 4}.Equal(reply.Answer[1].(*dns.A).A))
<mask>
<mask> req = createTestMessageWithType("my.alias.example.org.", dns.TypeA)
<mask> reply, err = dns.Exchange(req, addr.String())
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err)
</s> remove assert.True(t, ok)
</s> add require.True(t, ok) </s> remove assert.Nil(t, err)
assert.Len(t, reply.Answer, 1)
</s> add require.Nil(t, err)
require.Len(t, reply.Answer, 1) </s> remove assert.True(t, ok)
</s> add require.True(t, ok) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/dnsforward_test.go |
require.Nil(t, err)
| <mask> assert.True(t, net.IP{1, 2, 3, 4}.Equal(reply.Answer[1].(*dns.A).A))
<mask>
<mask> req = createTestMessageWithType("my.alias.example.org.", dns.TypeA)
<mask> reply, err = dns.Exchange(req, addr.String())
<mask> assert.Nil(t, err)
<mask> // The original question is restored.
<mask> assert.Equal(t, "my.alias.example.org.", reply.Question[0].Name)
<mask> assert.Len(t, reply.Answer, 2)
<mask> assert.Equal(t, "example.org.", reply.Answer[0].(*dns.CNAME).Target)
<mask> assert.Equal(t, dns.TypeA, reply.Answer[1].Header().Rrtype)
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.Len(t, reply.Answer, 2)
</s> add require.Len(t, reply.Answer, 2) </s> remove assert.Nil(t, err)
assert.Len(t, reply.Answer, 2)
</s> add require.Nil(t, err)
require.Len(t, reply.Answer, 2) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove assert.True(t, ok)
</s> add require.True(t, ok) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/dnsforward_test.go |
require.Len(t, reply.Question, 1) | <mask>
<mask> // The original question is restored.
<mask> assert.Equal(t, "my.alias.example.org.", reply.Question[0].Name)
<mask>
<mask> require.Len(t, reply.Answer, 2)
<mask> assert.Equal(t, "example.org.", reply.Answer[0].(*dns.CNAME).Target)
<mask> assert.Equal(t, dns.TypeA, reply.Answer[1].Header().Rrtype)
<mask> }
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.Len(t, reply.Answer, 2)
</s> add require.Len(t, reply.Answer, 2) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err)
</s> remove assert.Nil(t, err)
assert.Len(t, reply.Answer, 2)
</s> add require.Nil(t, err)
require.Len(t, reply.Answer, 2) </s> remove // set whois info on existing auto-client
_, _ = clients.AddHost("1.1.1.1", "host", ClientSourceRDNS)
clients.SetWhoisInfo("1.1.1.1", whois)
if assert.NotNil(t, clients.ipHost["1.1.1.1"]) {
</s> add require.Len(t, h.WhoisInfo, 2)
require.Len(t, h.WhoisInfo[0], 2)
assert.Equal(t, "orgname-val", h.WhoisInfo[0][1])
})
t.Run("existing_auto-client", func(t *testing.T) {
ok, err := clients.AddHost("1.1.1.1", "host", ClientSourceRDNS)
require.Nil(t, err)
assert.True(t, ok)
clients.SetWhoisInfo("1.1.1.1", whois)
require.NotNil(t, clients.ipHost["1.1.1.1"]) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/dnsforward_test.go |
require.Len(t, reply.Answer, 2) | <mask> reply, err = dns.Exchange(req, addr.String())
<mask> assert.Nil(t, err)
<mask> // The original question is restored.
<mask> assert.Equal(t, "my.alias.example.org.", reply.Question[0].Name)
<mask> assert.Len(t, reply.Answer, 2)
<mask> assert.Equal(t, "example.org.", reply.Answer[0].(*dns.CNAME).Target)
<mask> assert.Equal(t, dns.TypeA, reply.Answer[1].Header().Rrtype)
<mask> }
<mask>
<mask> func createTestServer(t *testing.T, filterConf *dnsfilter.Config, forwardConf ServerConfig) *Server {
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err)
</s> remove assert.Nil(t, err)
assert.Len(t, reply.Answer, 2)
</s> add require.Nil(t, err)
require.Len(t, reply.Answer, 2) </s> remove assert.True(t, ok)
</s> add require.True(t, ok) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/dnsforward_test.go |
<mask> assert.Equal(t, "example.org.", reply.Answer[0].(*dns.CNAME).Target)
<mask> assert.Equal(t, dns.TypeA, reply.Answer[1].Header().Rrtype)
<mask> }
<mask>
<mask> func createTestServer(t *testing.T, filterConf *dnsfilter.Config, forwardConf ServerConfig) *Server {
<mask> rules := `||nxdomain.example.org
<mask> ||null.example.org^
<mask> 127.0.0.1 host.example.org
<mask> @@||whitelist.example.org^
<mask> ||127.0.0.255`
<mask> filters := []dnsfilter.Filter{{
<mask> ID: 0, Data: []byte(rules),
<mask> }}
<mask>
<mask> f := dnsfilter.New(filterConf, filters)
<mask>
<mask> s := NewServer(DNSCreateParams{DNSFilter: f})
<mask> s.conf = forwardConf
<mask> assert.Nil(t, s.Prepare(nil))
<mask>
<mask> return s
<mask> }
<mask>
<mask> func createServerTLSConfig(t *testing.T) (*tls.Config, []byte, []byte) {
<mask> t.Helper()
<mask>
<mask> privateKey, err := rsa.GenerateKey(rand.Reader, 2048)
<mask> assert.Nilf(t, err, "cannot generate RSA key: %s", err)
<mask>
<mask> serialNumberLimit := new(big.Int).Lsh(big.NewInt(1), 128)
<mask> serialNumber, err := rand.Int(rand.Reader, serialNumberLimit)
<mask> assert.Nilf(t, err, "failed to generate serial number: %s", err)
<mask>
<mask> notBefore := time.Now()
<mask> notAfter := notBefore.Add(5 * 365 * time.Hour * 24)
<mask>
<mask> template := x509.Certificate{
<mask> SerialNumber: serialNumber,
<mask> Subject: pkix.Name{
<mask> Organization: []string{"AdGuard Tests"},
<mask> },
<mask> NotBefore: notBefore,
<mask> NotAfter: notAfter,
<mask>
<mask> KeyUsage: x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign,
<mask> ExtKeyUsage: []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth},
<mask> BasicConstraintsValid: true,
<mask> IsCA: true,
<mask> }
<mask> template.DNSNames = append(template.DNSNames, tlsServerName)
<mask>
<mask> derBytes, err := x509.CreateCertificate(rand.Reader, &template, &template, publicKey(privateKey), privateKey)
<mask> assert.Nilf(t, err, "failed to create certificate: %s", err)
<mask>
<mask> certPem := pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: derBytes})
<mask> keyPem := pem.EncodeToMemory(&pem.Block{Type: "RSA PRIVATE KEY", Bytes: x509.MarshalPKCS1PrivateKey(privateKey)})
<mask>
<mask> cert, err := tls.X509KeyPair(certPem, keyPem)
<mask> assert.Nilf(t, err, "failed to create certificate: %s", err)
<mask>
<mask> return &tls.Config{
<mask> Certificates: []tls.Certificate{cert},
<mask> ServerName: tlsServerName,
<mask> MinVersion: tls.VersionTLS12,
<mask> }, certPem, keyPem
<mask> }
<mask>
<mask> // sendTestMessagesAsync sends messages in parallel to check for race issues.
<mask> //lint:ignore U1000 it's called from the function which is skipped for now.
<mask> func sendTestMessagesAsync(t *testing.T, conn *dns.Conn) {
<mask> wg := &sync.WaitGroup{}
<mask>
<mask> for i := 0; i < testMessagesCount; i++ {
<mask> msg := createGoogleATestMessage()
<mask> wg.Add(1)
<mask>
<mask> go func() {
<mask> defer wg.Done()
<mask>
<mask> err := conn.WriteMsg(msg)
<mask> assert.Nilf(t, err, "cannot write message: %s", err)
<mask>
<mask> res, err := conn.ReadMsg()
<mask> assert.Nilf(t, err, "cannot read response to message: %s", err)
<mask>
<mask> assertGoogleAResponse(t, res)
<mask> }()
<mask> }
<mask>
<mask> wg.Wait()
<mask> }
<mask>
<mask> func sendTestMessages(t *testing.T, conn *dns.Conn) {
<mask> t.Helper()
<mask>
<mask> for i := 0; i < testMessagesCount; i++ {
<mask> req := createGoogleATestMessage()
<mask> err := conn.WriteMsg(req)
<mask> assert.Nilf(t, err, "cannot write message #%d: %s", i, err)
<mask>
<mask> res, err := conn.ReadMsg()
<mask> assert.Nilf(t, err, "cannot read response to message #%d: %s", i, err)
<mask> assertGoogleAResponse(t, res)
<mask> }
<mask> }
<mask>
<mask> func createGoogleATestMessage() *dns.Msg {
<mask> return createTestMessage("google-public-dns-a.google.com.")
<mask> }
<mask>
<mask> func createTestMessage(host string) *dns.Msg {
<mask> return &dns.Msg{
<mask> MsgHdr: dns.MsgHdr{
<mask> Id: dns.Id(),
<mask> RecursionDesired: true,
<mask> },
<mask> Question: []dns.Question{{
<mask> Name: host,
<mask> Qtype: dns.TypeA,
<mask> Qclass: dns.ClassINET,
<mask> }},
<mask> }
<mask> }
<mask>
<mask> func createTestMessageWithType(host string, qtype uint16) *dns.Msg {
<mask> req := createTestMessage(host)
<mask> req.Question[0].Qtype = qtype
<mask>
<mask> return req
<mask> }
<mask>
<mask> func assertGoogleAResponse(t *testing.T, reply *dns.Msg) {
<mask> assertResponse(t, reply, net.IP{8, 8, 8, 8})
<mask> }
<mask>
<mask> func assertResponse(t *testing.T, reply *dns.Msg, ip net.IP) {
<mask> t.Helper()
<mask>
<mask> if !assert.Lenf(t, reply.Answer, 1, "dns server returned reply with wrong number of answers - %d", len(reply.Answer)) {
<mask> return
<mask> }
<mask>
<mask> a, ok := reply.Answer[0].(*dns.A)
<mask> if assert.Truef(t, ok, "dns server returned wrong answer type instead of A: %v", reply.Answer[0]) {
<mask> assert.Truef(t, a.A.Equal(ip), "dns server returned wrong answer instead of %s: %s", ip, a.A)
<mask> }
<mask> }
<mask>
<mask> func publicKey(priv interface{}) interface{} {
<mask> switch k := priv.(type) {
<mask> case *rsa.PrivateKey:
<mask> return &k.PublicKey
<mask>
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.Nilf(t, err, "couldn't talk to server %s: %s", addr, err)
assert.Lenf(t, reply.Answer, 1, "dns server %s returned reply with wrong number of answers - %d", addr, len(reply.Answer))
</s> add require.Nilf(t, err, "couldn't talk to server %s: %s", addr, err)
require.Lenf(t, reply.Answer, 1, "dns server %s returned reply with wrong number of answers - %d", addr, len(reply.Answer)) </s> remove assert.Nilf(t, err, "couldn't talk to server %s: %s", addr, err)
assert.Lenf(t, reply.Answer, 1, "dns server %s returned reply with wrong number of answers - %d", addr, len(reply.Answer))
</s> add require.Nilf(t, err, "couldn't talk to server %s: %s", addr, err)
require.Lenf(t, reply.Answer, 1, "dns server %s returned reply with wrong number of answers - %d", addr, len(reply.Answer)) </s> remove assert.Truef(t, ok, "dns server %s returned wrong answer type instead of A: %v", addr, reply.Answer[0])
</s> add require.Truef(t, ok, "dns server %s returned wrong answer type instead of A: %v", addr, reply.Answer[0]) </s> remove assert.Nilf(t, err, "failed to start server: %s", err)
</s> add require.Nilf(t, err, "failed to start server: %s", err) </s> remove assert.Nilf(t, err, "couldn't talk to server %s: %s", addr, err)
assert.Lenf(t, reply.Answer, 1, "dns server %s returned reply with wrong number of answers - %d", addr, len(reply.Answer))
</s> add require.Nilf(t, err, "couldn't talk to server %s: %s", addr, err)
require.Lenf(t, reply.Answer, 1, "dns server %s returned reply with wrong number of answers - %d", addr, len(reply.Answer)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"re... | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/dnsforward_test.go | |
require.Equal(t, tc.valid, err == nil)
if tc.valid { | <mask>
<mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> defaultUpstream, err := validateUpstream(tc.upstream)
<mask> assert.Equal(t, tc.valid, err == nil)
<mask> if err == nil {
<mask> assert.Equal(t, tc.wantDef, defaultUpstream)
<mask> }
<mask> })
<mask> }
<mask> }
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.Nil(t, err)
if tc.name == "first" {
assert.True(t, true)
}
</s> add require.Nil(t, err) </s> remove assert.Nil(t, err, err)
</s> add require.Nil(t, err) </s> remove if werr != nil {
panic(werr)
}
</s> add require.Nil(t, werr) </s> remove // match sub-domain, but handle exception
r = d.processRewrites("sub.host.com", dns.TypeA)
assert.Equal(t, NotFilteredNotFound, r.Reason)
}
</s> add for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
r := d.processRewrites(tc.host, dns.TypeA)
if tc.want == nil {
assert.Equal(t, NotFilteredNotFound, r.Reason) </s> remove assert.Equal(t, tc.want, w.Body.String())
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/dnsforward_test.go |
testCases := []struct {
name string
msg string
set []string
wantNil bool
}{{
name: "empty",
msg: "empty upstreams array should be valid",
set: nil,
wantNil: true,
}, {
name: "comment",
msg: "comments should not be validated",
set: []string{"# comment"},
wantNil: true,
}, {
name: "valid_no_default",
msg: "there is no default upstream",
set: []string{
"[/host.com/]1.1.1.1",
"[//]tls://1.1.1.1",
"[/www.host.com/]#",
"[/host.com/google.com/]8.8.8.8",
"[/host/]sdns://AQMAAAAAAAAAFDE3Ni4xMDMuMTMwLjEzMDo1NDQzINErR_JS3PLCu_iZEIbq95zkSV2LFsigxDIuUso_OQhzIjIuZG5zY3J5cHQuZGVmYXVsdC5uczEuYWRndWFyZC5jb20",
},
wantNil: false,
}, {
name: "valid_with_default",
msg: "upstreams set is valid, but doesn't pass through validation cause: %s",
set: []string{
"[/host.com/]1.1.1.1",
"[//]tls://1.1.1.1",
"[/www.host.com/]#",
"[/host.com/google.com/]8.8.8.8",
"[/host/]sdns://AQMAAAAAAAAAFDE3Ni4xMDMuMTMwLjEzMDo1NDQzINErR_JS3PLCu_iZEIbq95zkSV2LFsigxDIuUso_OQhzIjIuZG5zY3J5cHQuZGVmYXVsdC5uczEuYWRndWFyZC5jb20",
"8.8.8.8",
},
wantNil: true,
}, {
name: "invalid",
msg: "there is an invalid upstream in set, but it pass through validation",
set: []string{"dhcp://fake.dns"},
wantNil: false,
}} | <mask> }
<mask> }
<mask>
<mask> func TestValidateUpstreamsSet(t *testing.T) {
<mask> // Empty upstreams array.
<mask> var upstreamsSet []string
<mask> assert.Nil(t, ValidateUpstreams(upstreamsSet), "empty upstreams array should be valid")
<mask>
<mask> // Comment in upstreams array.
<mask> upstreamsSet = []string{"# comment"}
<mask> assert.Nil(t, ValidateUpstreams(upstreamsSet), "comments should not be validated")
<mask>
<mask> // Set of valid upstreams. There is no default upstream specified.
<mask> upstreamsSet = []string{
<mask> "[/host.com/]1.1.1.1",
<mask> "[//]tls://1.1.1.1",
<mask> "[/www.host.com/]#",
<mask> "[/host.com/google.com/]8.8.8.8",
<mask> "[/host/]sdns://AQMAAAAAAAAAFDE3Ni4xMDMuMTMwLjEzMDo1NDQzINErR_JS3PLCu_iZEIbq95zkSV2LFsigxDIuUso_OQhzIjIuZG5zY3J5cHQuZGVmYXVsdC5uczEuYWRndWFyZC5jb20",
<mask> }
<mask> assert.NotNil(t, ValidateUpstreams(upstreamsSet), "there is no default upstream")
<mask>
<mask> // Let's add default upstream.
<mask> upstreamsSet = append(upstreamsSet, "8.8.8.8")
<mask> err := ValidateUpstreams(upstreamsSet)
<mask> assert.Nilf(t, err, "upstreams set is valid, but doesn't pass through validation cause: %s", err)
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove // Let's add default upstream.
upstreamsSet = append(upstreamsSet, "8.8.8.8")
err := ValidateUpstreams(upstreamsSet)
assert.Nilf(t, err, "upstreams set is valid, but doesn't pass through validation cause: %s", err)
</s> add for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
err := ValidateUpstreams(tc.set) </s> remove // Let's add invalid upstream.
upstreamsSet = append(upstreamsSet, "dhcp://fake.dns")
assert.NotNil(t, ValidateUpstreams(upstreamsSet), "there is an invalid upstream in set, but it pass through validation")
</s> add assert.Equalf(t, tc.wantNil, err == nil, tc.msg, err)
})
} </s> remove addr := net.UDPAddr{
IP: net.ParseIP("1:2:3::4"),
Port: 12345,
Zone: "eth0",
}
assert.Equal(t, IPStringFromAddr(&addr), addr.IP.String())
assert.Empty(t, IPStringFromAddr(nil))
</s> add t.Run("not_nil", func(t *testing.T) {
addr := net.UDPAddr{
IP: net.ParseIP("1:2:3::4"),
Port: 12345,
Zone: "eth0",
}
assert.Equal(t, IPStringFromAddr(&addr), addr.IP.String())
})
t.Run("nil", func(t *testing.T) {
assert.Empty(t, IPStringFromAddr(nil))
}) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove // 'badhost' has a canonical name 'null.example.org' which is blocked by
// filters: but protection is disabled so response is _not_ blocked.
</s> add // 'badhost' has a canonical name 'null.example.org' which should be
// blocked by filters, but protection is disabled so it is not. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/dnsforward_test.go |
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
err := ValidateUpstreams(tc.set) | <mask> "[/host/]sdns://AQMAAAAAAAAAFDE3Ni4xMDMuMTMwLjEzMDo1NDQzINErR_JS3PLCu_iZEIbq95zkSV2LFsigxDIuUso_OQhzIjIuZG5zY3J5cHQuZGVmYXVsdC5uczEuYWRndWFyZC5jb20",
<mask> }
<mask> assert.NotNil(t, ValidateUpstreams(upstreamsSet), "there is no default upstream")
<mask>
<mask> // Let's add default upstream.
<mask> upstreamsSet = append(upstreamsSet, "8.8.8.8")
<mask> err := ValidateUpstreams(upstreamsSet)
<mask> assert.Nilf(t, err, "upstreams set is valid, but doesn't pass through validation cause: %s", err)
<mask>
<mask> // Let's add invalid upstream.
<mask> upstreamsSet = append(upstreamsSet, "dhcp://fake.dns")
<mask> assert.NotNil(t, ValidateUpstreams(upstreamsSet), "there is an invalid upstream in set, but it pass through validation")
<mask> }
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove // Let's add invalid upstream.
upstreamsSet = append(upstreamsSet, "dhcp://fake.dns")
assert.NotNil(t, ValidateUpstreams(upstreamsSet), "there is an invalid upstream in set, but it pass through validation")
</s> add assert.Equalf(t, tc.wantNil, err == nil, tc.msg, err)
})
} </s> remove // Empty upstreams array.
var upstreamsSet []string
assert.Nil(t, ValidateUpstreams(upstreamsSet), "empty upstreams array should be valid")
// Comment in upstreams array.
upstreamsSet = []string{"# comment"}
assert.Nil(t, ValidateUpstreams(upstreamsSet), "comments should not be validated")
// Set of valid upstreams. There is no default upstream specified.
upstreamsSet = []string{
"[/host.com/]1.1.1.1",
"[//]tls://1.1.1.1",
"[/www.host.com/]#",
"[/host.com/google.com/]8.8.8.8",
"[/host/]sdns://AQMAAAAAAAAAFDE3Ni4xMDMuMTMwLjEzMDo1NDQzINErR_JS3PLCu_iZEIbq95zkSV2LFsigxDIuUso_OQhzIjIuZG5zY3J5cHQuZGVmYXVsdC5uczEuYWRndWFyZC5jb20",
}
assert.NotNil(t, ValidateUpstreams(upstreamsSet), "there is no default upstream")
</s> add testCases := []struct {
name string
msg string
set []string
wantNil bool
}{{
name: "empty",
msg: "empty upstreams array should be valid",
set: nil,
wantNil: true,
}, {
name: "comment",
msg: "comments should not be validated",
set: []string{"# comment"},
wantNil: true,
}, {
name: "valid_no_default",
msg: "there is no default upstream",
set: []string{
"[/host.com/]1.1.1.1",
"[//]tls://1.1.1.1",
"[/www.host.com/]#",
"[/host.com/google.com/]8.8.8.8",
"[/host/]sdns://AQMAAAAAAAAAFDE3Ni4xMDMuMTMwLjEzMDo1NDQzINErR_JS3PLCu_iZEIbq95zkSV2LFsigxDIuUso_OQhzIjIuZG5zY3J5cHQuZGVmYXVsdC5uczEuYWRndWFyZC5jb20",
},
wantNil: false,
}, {
name: "valid_with_default",
msg: "upstreams set is valid, but doesn't pass through validation cause: %s",
set: []string{
"[/host.com/]1.1.1.1",
"[//]tls://1.1.1.1",
"[/www.host.com/]#",
"[/host.com/google.com/]8.8.8.8",
"[/host/]sdns://AQMAAAAAAAAAFDE3Ni4xMDMuMTMwLjEzMDo1NDQzINErR_JS3PLCu_iZEIbq95zkSV2LFsigxDIuUso_OQhzIjIuZG5zY3J5cHQuZGVmYXVsdC5uczEuYWRndWFyZC5jb20",
"8.8.8.8",
},
wantNil: true,
}, {
name: "invalid",
msg: "there is an invalid upstream in set, but it pass through validation",
set: []string{"dhcp://fake.dns"},
wantNil: false,
}} </s> remove addr := net.UDPAddr{
IP: net.ParseIP("1:2:3::4"),
Port: 12345,
Zone: "eth0",
}
assert.Equal(t, IPStringFromAddr(&addr), addr.IP.String())
assert.Empty(t, IPStringFromAddr(nil))
</s> add t.Run("not_nil", func(t *testing.T) {
addr := net.UDPAddr{
IP: net.ParseIP("1:2:3::4"),
Port: 12345,
Zone: "eth0",
}
assert.Equal(t, IPStringFromAddr(&addr), addr.IP.String())
})
t.Run("nil", func(t *testing.T) {
assert.Empty(t, IPStringFromAddr(nil))
}) </s> remove // 'badhost' has a canonical name 'null.example.org' which is blocked by
// filters: but protection is disabled so response is _not_ blocked.
</s> add // 'badhost' has a canonical name 'null.example.org' which should be
// blocked by filters, but protection is disabled so it is not. </s> remove err := s.startWithUpstream(testUpstm)
assert.Nil(t, err)
</s> add s.dnsProxy.UpstreamConfig = &proxy.UpstreamConfig{
Upstreams: []upstream.Upstream{testUpstm},
}
startDeferStop(t, s)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/dnsforward_test.go |
assert.Equalf(t, tc.wantNil, err == nil, tc.msg, err)
})
} | <mask> upstreamsSet = append(upstreamsSet, "8.8.8.8")
<mask> err := ValidateUpstreams(upstreamsSet)
<mask> assert.Nilf(t, err, "upstreams set is valid, but doesn't pass through validation cause: %s", err)
<mask>
<mask> // Let's add invalid upstream.
<mask> upstreamsSet = append(upstreamsSet, "dhcp://fake.dns")
<mask> assert.NotNil(t, ValidateUpstreams(upstreamsSet), "there is an invalid upstream in set, but it pass through validation")
<mask> }
<mask>
<mask> func TestIPStringFromAddr(t *testing.T) {
<mask> addr := net.UDPAddr{
<mask> IP: net.ParseIP("1:2:3::4"),
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove // Let's add default upstream.
upstreamsSet = append(upstreamsSet, "8.8.8.8")
err := ValidateUpstreams(upstreamsSet)
assert.Nilf(t, err, "upstreams set is valid, but doesn't pass through validation cause: %s", err)
</s> add for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
err := ValidateUpstreams(tc.set) </s> remove // Empty upstreams array.
var upstreamsSet []string
assert.Nil(t, ValidateUpstreams(upstreamsSet), "empty upstreams array should be valid")
// Comment in upstreams array.
upstreamsSet = []string{"# comment"}
assert.Nil(t, ValidateUpstreams(upstreamsSet), "comments should not be validated")
// Set of valid upstreams. There is no default upstream specified.
upstreamsSet = []string{
"[/host.com/]1.1.1.1",
"[//]tls://1.1.1.1",
"[/www.host.com/]#",
"[/host.com/google.com/]8.8.8.8",
"[/host/]sdns://AQMAAAAAAAAAFDE3Ni4xMDMuMTMwLjEzMDo1NDQzINErR_JS3PLCu_iZEIbq95zkSV2LFsigxDIuUso_OQhzIjIuZG5zY3J5cHQuZGVmYXVsdC5uczEuYWRndWFyZC5jb20",
}
assert.NotNil(t, ValidateUpstreams(upstreamsSet), "there is no default upstream")
</s> add testCases := []struct {
name string
msg string
set []string
wantNil bool
}{{
name: "empty",
msg: "empty upstreams array should be valid",
set: nil,
wantNil: true,
}, {
name: "comment",
msg: "comments should not be validated",
set: []string{"# comment"},
wantNil: true,
}, {
name: "valid_no_default",
msg: "there is no default upstream",
set: []string{
"[/host.com/]1.1.1.1",
"[//]tls://1.1.1.1",
"[/www.host.com/]#",
"[/host.com/google.com/]8.8.8.8",
"[/host/]sdns://AQMAAAAAAAAAFDE3Ni4xMDMuMTMwLjEzMDo1NDQzINErR_JS3PLCu_iZEIbq95zkSV2LFsigxDIuUso_OQhzIjIuZG5zY3J5cHQuZGVmYXVsdC5uczEuYWRndWFyZC5jb20",
},
wantNil: false,
}, {
name: "valid_with_default",
msg: "upstreams set is valid, but doesn't pass through validation cause: %s",
set: []string{
"[/host.com/]1.1.1.1",
"[//]tls://1.1.1.1",
"[/www.host.com/]#",
"[/host.com/google.com/]8.8.8.8",
"[/host/]sdns://AQMAAAAAAAAAFDE3Ni4xMDMuMTMwLjEzMDo1NDQzINErR_JS3PLCu_iZEIbq95zkSV2LFsigxDIuUso_OQhzIjIuZG5zY3J5cHQuZGVmYXVsdC5uczEuYWRndWFyZC5jb20",
"8.8.8.8",
},
wantNil: true,
}, {
name: "invalid",
msg: "there is an invalid upstream in set, but it pass through validation",
set: []string{"dhcp://fake.dns"},
wantNil: false,
}} </s> remove addr := net.UDPAddr{
IP: net.ParseIP("1:2:3::4"),
Port: 12345,
Zone: "eth0",
}
assert.Equal(t, IPStringFromAddr(&addr), addr.IP.String())
assert.Empty(t, IPStringFromAddr(nil))
</s> add t.Run("not_nil", func(t *testing.T) {
addr := net.UDPAddr{
IP: net.ParseIP("1:2:3::4"),
Port: 12345,
Zone: "eth0",
}
assert.Equal(t, IPStringFromAddr(&addr), addr.IP.String())
})
t.Run("nil", func(t *testing.T) {
assert.Empty(t, IPStringFromAddr(nil))
}) </s> remove // 'badhost' has a canonical name 'null.example.org' which is blocked by
// filters: but protection is disabled so response is _not_ blocked.
</s> add // 'badhost' has a canonical name 'null.example.org' which should be
// blocked by filters, but protection is disabled so it is not. </s> remove err := s.startWithUpstream(testUpstm)
assert.Nil(t, err)
</s> add s.dnsProxy.UpstreamConfig = &proxy.UpstreamConfig{
Upstreams: []upstream.Upstream{testUpstm},
}
startDeferStop(t, s)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/dnsforward_test.go |
t.Run("not_nil", func(t *testing.T) {
addr := net.UDPAddr{
IP: net.ParseIP("1:2:3::4"),
Port: 12345,
Zone: "eth0",
}
assert.Equal(t, IPStringFromAddr(&addr), addr.IP.String())
})
t.Run("nil", func(t *testing.T) {
assert.Empty(t, IPStringFromAddr(nil))
}) | <mask> assert.NotNil(t, ValidateUpstreams(upstreamsSet), "there is an invalid upstream in set, but it pass through validation")
<mask> }
<mask>
<mask> func TestIPStringFromAddr(t *testing.T) {
<mask> addr := net.UDPAddr{
<mask> IP: net.ParseIP("1:2:3::4"),
<mask> Port: 12345,
<mask> Zone: "eth0",
<mask> }
<mask> assert.Equal(t, IPStringFromAddr(&addr), addr.IP.String())
<mask> assert.Empty(t, IPStringFromAddr(nil))
<mask> }
<mask>
<mask> func TestMatchDNSName(t *testing.T) {
<mask> dnsNames := []string{"host1", "*.host2", "1.2.3.4"}
<mask> sort.Strings(dnsNames)
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove // Let's add invalid upstream.
upstreamsSet = append(upstreamsSet, "dhcp://fake.dns")
assert.NotNil(t, ValidateUpstreams(upstreamsSet), "there is an invalid upstream in set, but it pass through validation")
</s> add assert.Equalf(t, tc.wantNil, err == nil, tc.msg, err)
})
} </s> remove // Let's add default upstream.
upstreamsSet = append(upstreamsSet, "8.8.8.8")
err := ValidateUpstreams(upstreamsSet)
assert.Nilf(t, err, "upstreams set is valid, but doesn't pass through validation cause: %s", err)
</s> add for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
err := ValidateUpstreams(tc.set) </s> remove // Empty upstreams array.
var upstreamsSet []string
assert.Nil(t, ValidateUpstreams(upstreamsSet), "empty upstreams array should be valid")
// Comment in upstreams array.
upstreamsSet = []string{"# comment"}
assert.Nil(t, ValidateUpstreams(upstreamsSet), "comments should not be validated")
// Set of valid upstreams. There is no default upstream specified.
upstreamsSet = []string{
"[/host.com/]1.1.1.1",
"[//]tls://1.1.1.1",
"[/www.host.com/]#",
"[/host.com/google.com/]8.8.8.8",
"[/host/]sdns://AQMAAAAAAAAAFDE3Ni4xMDMuMTMwLjEzMDo1NDQzINErR_JS3PLCu_iZEIbq95zkSV2LFsigxDIuUso_OQhzIjIuZG5zY3J5cHQuZGVmYXVsdC5uczEuYWRndWFyZC5jb20",
}
assert.NotNil(t, ValidateUpstreams(upstreamsSet), "there is no default upstream")
</s> add testCases := []struct {
name string
msg string
set []string
wantNil bool
}{{
name: "empty",
msg: "empty upstreams array should be valid",
set: nil,
wantNil: true,
}, {
name: "comment",
msg: "comments should not be validated",
set: []string{"# comment"},
wantNil: true,
}, {
name: "valid_no_default",
msg: "there is no default upstream",
set: []string{
"[/host.com/]1.1.1.1",
"[//]tls://1.1.1.1",
"[/www.host.com/]#",
"[/host.com/google.com/]8.8.8.8",
"[/host/]sdns://AQMAAAAAAAAAFDE3Ni4xMDMuMTMwLjEzMDo1NDQzINErR_JS3PLCu_iZEIbq95zkSV2LFsigxDIuUso_OQhzIjIuZG5zY3J5cHQuZGVmYXVsdC5uczEuYWRndWFyZC5jb20",
},
wantNil: false,
}, {
name: "valid_with_default",
msg: "upstreams set is valid, but doesn't pass through validation cause: %s",
set: []string{
"[/host.com/]1.1.1.1",
"[//]tls://1.1.1.1",
"[/www.host.com/]#",
"[/host.com/google.com/]8.8.8.8",
"[/host/]sdns://AQMAAAAAAAAAFDE3Ni4xMDMuMTMwLjEzMDo1NDQzINErR_JS3PLCu_iZEIbq95zkSV2LFsigxDIuUso_OQhzIjIuZG5zY3J5cHQuZGVmYXVsdC5uczEuYWRndWFyZC5jb20",
"8.8.8.8",
},
wantNil: true,
}, {
name: "invalid",
msg: "there is an invalid upstream in set, but it pass through validation",
set: []string{"dhcp://fake.dns"},
wantNil: false,
}} </s> remove if err == nil {
t.Fatalf("expected an error because %s but no error returned", descr)
}
</s> add require.NotNilf(t, err, "expected an error because %s but no error returned", descr) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/dnsforward_test.go |
<mask> }
<mask> func (d *testDHCP) SetOnLeaseChanged(onLeaseChanged dhcpd.OnLeaseChangedT) {}
<mask>
<mask> func TestPTRResponseFromDHCPLeases(t *testing.T) {
<mask> dhcp := &testDHCP{}
<mask>
<mask> s := NewServer(DNSCreateParams{
<mask> DNSFilter: dnsfilter.New(&dnsfilter.Config{}, nil),
<mask> DHCPServer: dhcp,
<mask> })
<mask>
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove DHCPServer: dhcp,
</s> add DHCPServer: &testDHCP{}, </s> remove conf := ServerConfig{
</s> add conf := &ServerConfig{ </s> remove err := s.Start()
assert.Nil(t, err)
defer assert.Nil(t, s.Stop())
</s> add require.Nil(t, s.Start())
t.Cleanup(func() {
require.Nil(t, s.Stop())
}) </s> remove assert.Nilf(t, err, "dns server failed to stop: %s", err)
</s> add require.Nilf(t, err, "dns server failed to stop: %s", err) </s> remove assert.Nilf(t, err, "Error while matching host %s: %s", hostname, err)
</s> add require.Nilf(t, err, "Error while matching host %s: %s", hostname, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/dnsforward_test.go | |
DHCPServer: &testDHCP{}, | <mask> dhcp := &testDHCP{}
<mask>
<mask> s := NewServer(DNSCreateParams{
<mask> DNSFilter: dnsfilter.New(&dnsfilter.Config{}, nil),
<mask> DHCPServer: dhcp,
<mask> })
<mask>
<mask> s.conf.UDPListenAddr = &net.UDPAddr{}
<mask> s.conf.TCPListenAddr = &net.TCPAddr{}
<mask> s.conf.UpstreamDNS = []string{"127.0.0.1:53"}
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove dhcp := &testDHCP{}
</s> add </s> remove assert.Nil(t, s.Prepare(nil))
</s> add require.Nil(t, s.Prepare(nil)) </s> remove err := s.Prepare(nil)
assert.Nil(t, err)
</s> add require.Nil(t, s.Prepare(nil))
require.Nil(t, s.Start())
t.Cleanup(func() {
s.Close()
}) </s> remove conf := ServerConfig{
</s> add conf := &ServerConfig{ </s> remove assert.Nil(t, s.Start())
</s> add require.Nil(t, s.Start())
t.Cleanup(func() {
s.Close()
}) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/dnsforward_test.go |
require.Nil(t, s.Prepare(nil))
require.Nil(t, s.Start())
t.Cleanup(func() {
s.Close()
}) | <mask> s.conf.UDPListenAddr = &net.UDPAddr{}
<mask> s.conf.TCPListenAddr = &net.TCPAddr{}
<mask> s.conf.UpstreamDNS = []string{"127.0.0.1:53"}
<mask> s.conf.FilteringConfig.ProtectionEnabled = true
<mask> err := s.Prepare(nil)
<mask> assert.Nil(t, err)
<mask>
<mask> assert.Nil(t, s.Start())
<mask> addr := s.dnsProxy.Addr(proxy.ProtoUDP)
<mask>
<mask> req := createTestMessageWithType("1.0.0.127.in-addr.arpa.", dns.TypePTR)
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.Nil(t, s.Prepare(nil))
</s> add require.Nil(t, s.Prepare(nil)) </s> remove assert.Nil(t, s.Start())
</s> add require.Nil(t, s.Start())
t.Cleanup(func() {
s.Close()
}) </s> remove assert.Nil(t, s.Start())
</s> add </s> remove DHCPServer: dhcp,
</s> add DHCPServer: &testDHCP{}, </s> remove assert.Nil(t, err)
assert.Len(t, resp.Answer, 1)
</s> add require.Nil(t, err)
require.Len(t, resp.Answer, 1) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/dnsforward_test.go |
<mask> s.conf.FilteringConfig.ProtectionEnabled = true
<mask> err := s.Prepare(nil)
<mask> assert.Nil(t, err)
<mask>
<mask> assert.Nil(t, s.Start())
<mask> addr := s.dnsProxy.Addr(proxy.ProtoUDP)
<mask>
<mask> req := createTestMessageWithType("1.0.0.127.in-addr.arpa.", dns.TypePTR)
<mask>
<mask> resp, err := dns.Exchange(req, addr.String())
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.Nil(t, s.Start())
</s> add require.Nil(t, s.Start())
t.Cleanup(func() {
s.Close()
}) </s> remove err := s.Prepare(nil)
assert.Nil(t, err)
</s> add require.Nil(t, s.Prepare(nil))
require.Nil(t, s.Start())
t.Cleanup(func() {
s.Close()
}) </s> remove assert.Nil(t, s.Prepare(nil))
</s> add require.Nil(t, s.Prepare(nil)) </s> remove assert.Nil(t, err)
assert.Len(t, resp.Answer, 1)
</s> add require.Nil(t, err)
require.Len(t, resp.Answer, 1) </s> remove
assert.Nil(t, err)
assert.Len(t, resp.Answer, 1)
</s> add require.Nil(t, err)
require.Len(t, resp.Answer, 1) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/dnsforward_test.go | |
require.Nil(t, err)
require.Len(t, resp.Answer, 1) | <mask>
<mask> req := createTestMessageWithType("1.0.0.127.in-addr.arpa.", dns.TypePTR)
<mask>
<mask> resp, err := dns.Exchange(req, addr.String())
<mask>
<mask> assert.Nil(t, err)
<mask> assert.Len(t, resp.Answer, 1)
<mask> assert.Equal(t, dns.TypePTR, resp.Answer[0].Header().Rrtype)
<mask> assert.Equal(t, "1.0.0.127.in-addr.arpa.", resp.Answer[0].Header().Name)
<mask>
<mask> ptr, ok := resp.Answer[0].(*dns.PTR)
<mask> if assert.True(t, ok) {
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.Nil(t, err)
assert.Len(t, resp.Answer, 1)
</s> add require.Nil(t, err)
require.Len(t, resp.Answer, 1) </s> remove if assert.True(t, ok) {
assert.Equal(t, "host.", ptr.Ptr)
}
s.Close()
</s> add require.True(t, ok)
assert.Equal(t, "host.", ptr.Ptr) </s> remove if assert.True(t, ok) {
assert.Equal(t, "localhost.", ptr.Ptr)
}
s.Close()
</s> add require.True(t, ok)
assert.Equal(t, "localhost.", ptr.Ptr) </s> remove assert.Nil(t, s.Start())
</s> add </s> remove assert.Nil(t, s.Start())
</s> add require.Nil(t, s.Start())
t.Cleanup(func() {
s.Close()
}) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/dnsforward_test.go |
require.True(t, ok)
assert.Equal(t, "localhost.", ptr.Ptr) | <mask> assert.Equal(t, dns.TypePTR, resp.Answer[0].Header().Rrtype)
<mask> assert.Equal(t, "1.0.0.127.in-addr.arpa.", resp.Answer[0].Header().Name)
<mask>
<mask> ptr, ok := resp.Answer[0].(*dns.PTR)
<mask> if assert.True(t, ok) {
<mask> assert.Equal(t, "localhost.", ptr.Ptr)
<mask> }
<mask>
<mask> s.Close()
<mask> }
<mask>
<mask> func TestPTRResponseFromHosts(t *testing.T) {
<mask> c := dnsfilter.Config{
<mask> AutoHosts: &util.AutoHosts{},
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove if assert.True(t, ok) {
assert.Equal(t, "host.", ptr.Ptr)
}
s.Close()
</s> add require.True(t, ok)
assert.Equal(t, "host.", ptr.Ptr) </s> remove
assert.Nil(t, err)
assert.Len(t, resp.Answer, 1)
</s> add require.Nil(t, err)
require.Len(t, resp.Answer, 1) </s> remove assert.Nil(t, err)
assert.Len(t, resp.Answer, 1)
</s> add require.Nil(t, err)
require.Len(t, resp.Answer, 1) </s> remove assert.Nil(t, clients.list["client1"])
if assert.Len(t, c.IDs, 1) {
assert.Equal(t, "1.1.1.2", c.IDs[0])
}
</s> add nilCli, ok := clients.list["client1"]
require.False(t, ok)
assert.Nil(t, nilCli)
require.Len(t, c.IDs, 1)
assert.Equal(t, "1.1.1.2", c.IDs[0]) </s> remove if assert.Len(t, d.Res.Answer, 1) {
ans, ok := d.Res.Answer[0].(*dns.MX)
if assert.True(t, ok) {
assert.Equal(t, mx.Exchange, ans.Mx)
assert.Equal(t, mx.Preference, ans.Preference)
}
}
</s> add require.Len(t, d.Res.Answer, 1)
ans, ok := d.Res.Answer[0].(*dns.MX)
require.True(t, ok)
assert.Equal(t, mx.Exchange, ans.Mx)
assert.Equal(t, mx.Preference, ans.Preference) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/dnsforward_test.go |
require.Nil(t, err)
t.Cleanup(func() {
assert.Nil(t, hf.Close())
assert.Nil(t, os.Remove(hf.Name()))
}) | <mask> }
<mask>
<mask> // Prepare test hosts file.
<mask> hf, err := ioutil.TempFile("", "")
<mask> if assert.Nil(t, err) {
<mask> t.Cleanup(func() {
<mask> assert.Nil(t, hf.Close())
<mask> assert.Nil(t, os.Remove(hf.Name()))
<mask> })
<mask> }
<mask>
<mask> _, _ = hf.WriteString(" 127.0.0.1 host # comment \n")
<mask> _, _ = hf.WriteString(" ::1 localhost#comment \n")
<mask>
<mask> // Init auto hosts.
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove dir := prepareTestDir()
defer func() { _ = os.RemoveAll(dir) }()
</s> add dir := prepareTestDir(t) </s> remove if err != nil {
panic(err)
}
</s> add require.Nil(t, err)
go func() {
_ = http.Serve(listener, mux)
}()
t.Cleanup(func() {
assert.Nil(t, listener.Close())
}) </s> remove content := `||example.org^$third-party
# Inline comment example
||example.com^$third-party
0.0.0.0 example.com
`
_, _ = w.Write([]byte(content))
</s> add _, werr := w.Write([]byte(content))
assert.Nil(t, werr) </s> remove func TestClientsAddExisting(t *testing.T) {
var c *Client
clients := clientsContainer{}
clients.testing = true
clients.Init(nil, nil, nil)
</s> add t.Run("can't_set_manually-added", func(t *testing.T) {
ok, err := clients.Add(&Client{
IDs: []string{"1.1.1.2"},
Name: "client1",
})
require.Nil(t, err)
assert.True(t, ok) </s> remove _ = os.RemoveAll(dir)
_ = os.MkdirAll(dir, 0o755)
</s> add require.Nil(t, os.RemoveAll(dir))
// TODO(e.burkov): Replace with testing.TempDir after updating Go
// version to 1.16.
require.Nil(t, os.MkdirAll(dir, 0o755))
t.Cleanup(func() { require.Nil(t, os.RemoveAll(dir)) })
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/dnsforward_test.go |
require.Nil(t, s.Prepare(nil)) | <mask> s.conf.UDPListenAddr = &net.UDPAddr{}
<mask> s.conf.TCPListenAddr = &net.TCPAddr{}
<mask> s.conf.UpstreamDNS = []string{"127.0.0.1:53"}
<mask> s.conf.FilteringConfig.ProtectionEnabled = true
<mask> assert.Nil(t, s.Prepare(nil))
<mask>
<mask> assert.Nil(t, s.Start())
<mask>
<mask> addr := s.dnsProxy.Addr(proxy.ProtoUDP)
<mask> req := createTestMessageWithType("1.0.0.127.in-addr.arpa.", dns.TypePTR)
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove err := s.Prepare(nil)
assert.Nil(t, err)
</s> add require.Nil(t, s.Prepare(nil))
require.Nil(t, s.Start())
t.Cleanup(func() {
s.Close()
}) </s> remove assert.Nil(t, s.Start())
</s> add require.Nil(t, s.Start())
t.Cleanup(func() {
s.Close()
}) </s> remove DHCPServer: dhcp,
</s> add DHCPServer: &testDHCP{}, </s> remove assert.Nil(t, s.Start())
</s> add </s> remove assert.Nil(t, err)
assert.Len(t, resp.Answer, 1)
</s> add require.Nil(t, err)
require.Len(t, resp.Answer, 1) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/dnsforward_test.go |
require.Nil(t, s.Start())
t.Cleanup(func() {
s.Close()
}) | <mask> s.conf.UpstreamDNS = []string{"127.0.0.1:53"}
<mask> s.conf.FilteringConfig.ProtectionEnabled = true
<mask> assert.Nil(t, s.Prepare(nil))
<mask>
<mask> assert.Nil(t, s.Start())
<mask>
<mask> addr := s.dnsProxy.Addr(proxy.ProtoUDP)
<mask> req := createTestMessageWithType("1.0.0.127.in-addr.arpa.", dns.TypePTR)
<mask>
<mask> resp, err := dns.Exchange(req, addr.String())
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.Nil(t, s.Prepare(nil))
</s> add require.Nil(t, s.Prepare(nil)) </s> remove assert.Nil(t, s.Start())
</s> add </s> remove err := s.Prepare(nil)
assert.Nil(t, err)
</s> add require.Nil(t, s.Prepare(nil))
require.Nil(t, s.Start())
t.Cleanup(func() {
s.Close()
}) </s> remove assert.Nil(t, err)
assert.Len(t, resp.Answer, 1)
</s> add require.Nil(t, err)
require.Len(t, resp.Answer, 1) </s> remove
assert.Nil(t, err)
assert.Len(t, resp.Answer, 1)
</s> add require.Nil(t, err)
require.Len(t, resp.Answer, 1) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/dnsforward_test.go |
require.Nil(t, err)
require.Len(t, resp.Answer, 1) | <mask> addr := s.dnsProxy.Addr(proxy.ProtoUDP)
<mask> req := createTestMessageWithType("1.0.0.127.in-addr.arpa.", dns.TypePTR)
<mask>
<mask> resp, err := dns.Exchange(req, addr.String())
<mask> assert.Nil(t, err)
<mask> assert.Len(t, resp.Answer, 1)
<mask> assert.Equal(t, dns.TypePTR, resp.Answer[0].Header().Rrtype)
<mask> assert.Equal(t, "1.0.0.127.in-addr.arpa.", resp.Answer[0].Header().Name)
<mask>
<mask> ptr, ok := resp.Answer[0].(*dns.PTR)
<mask> if assert.True(t, ok) {
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove
assert.Nil(t, err)
assert.Len(t, resp.Answer, 1)
</s> add require.Nil(t, err)
require.Len(t, resp.Answer, 1) </s> remove if assert.True(t, ok) {
assert.Equal(t, "host.", ptr.Ptr)
}
s.Close()
</s> add require.True(t, ok)
assert.Equal(t, "host.", ptr.Ptr) </s> remove assert.Nil(t, s.Start())
</s> add </s> remove if assert.True(t, ok) {
assert.Equal(t, "localhost.", ptr.Ptr)
}
s.Close()
</s> add require.True(t, ok)
assert.Equal(t, "localhost.", ptr.Ptr) </s> remove assert.Nil(t, s.Start())
</s> add require.Nil(t, s.Start())
t.Cleanup(func() {
s.Close()
}) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/dnsforward_test.go |
require.True(t, ok)
assert.Equal(t, "host.", ptr.Ptr) | <mask> assert.Equal(t, dns.TypePTR, resp.Answer[0].Header().Rrtype)
<mask> assert.Equal(t, "1.0.0.127.in-addr.arpa.", resp.Answer[0].Header().Name)
<mask>
<mask> ptr, ok := resp.Answer[0].(*dns.PTR)
<mask> if assert.True(t, ok) {
<mask> assert.Equal(t, "host.", ptr.Ptr)
<mask> }
<mask>
<mask> s.Close()
<mask> }
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove if assert.True(t, ok) {
assert.Equal(t, "localhost.", ptr.Ptr)
}
s.Close()
</s> add require.True(t, ok)
assert.Equal(t, "localhost.", ptr.Ptr) </s> remove
assert.Nil(t, err)
assert.Len(t, resp.Answer, 1)
</s> add require.Nil(t, err)
require.Len(t, resp.Answer, 1) </s> remove assert.Nil(t, err)
assert.Len(t, resp.Answer, 1)
</s> add require.Nil(t, err)
require.Len(t, resp.Answer, 1) </s> remove assert.Nil(t, clients.list["client1"])
if assert.Len(t, c.IDs, 1) {
assert.Equal(t, "1.1.1.2", c.IDs[0])
}
</s> add nilCli, ok := clients.list["client1"]
require.False(t, ok)
assert.Nil(t, nilCli)
require.Len(t, c.IDs, 1)
assert.Equal(t, "1.1.1.2", c.IDs[0]) </s> remove assert.True(t, reply.Answer[0].(*dns.A).A.IsUnspecified())
</s> add require.Len(t, reply.Answer, 1)
a, ok := reply.Answer[0].(*dns.A)
require.True(t, ok)
assert.True(t, a.A.IsUnspecified()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/dnsforward_test.go |
"github.com/stretchr/testify/require" | <mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/urlfilter/rules"
<mask> "github.com/miekg/dns"
<mask> "github.com/stretchr/testify/assert"
<mask> )
<mask>
<mask> func TestServer_FilterDNSRewrite(t *testing.T) {
<mask> // Helper data.
<mask> ip4 := net.IP{127, 0, 0, 1}
<mask> ip6 := net.IP{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.Nil(t, s.Prepare(&conf))
</s> add require.Nil(t, s.Prepare(conf)) </s> remove assert.NotNil(t, s.Prepare(&conf))
</s> add assert.NotNil(t, s.Prepare(conf)) </s> remove t.Run("cname", func(t *testing.T) {
dtyp := dns.TypeA
host := path.Base(t.Name())
res, err := f.CheckHostRules(host, dtyp, setts)
assert.Nil(t, err)
assert.Equal(t, "new-cname", res.CanonName)
})
t.Run("a-record", func(t *testing.T) {
dtyp := dns.TypeA
host := path.Base(t.Name())
res, err := f.CheckHostRules(host, dtyp, setts)
assert.Nil(t, err)
if dnsrr := res.DNSRewriteResult; assert.NotNil(t, dnsrr) {
assert.Equal(t, dns.RcodeSuccess, dnsrr.RCode)
if ipVals := dnsrr.Response[dtyp]; assert.Len(t, ipVals, 1) {
assert.Equal(t, ipv4p1, ipVals[0])
}
}
})
t.Run("aaaa-record", func(t *testing.T) {
dtyp := dns.TypeAAAA
host := path.Base(t.Name())
res, err := f.CheckHostRules(host, dtyp, setts)
assert.Nil(t, err)
if dnsrr := res.DNSRewriteResult; assert.NotNil(t, dnsrr) {
assert.Equal(t, dns.RcodeSuccess, dnsrr.RCode)
if ipVals := dnsrr.Response[dtyp]; assert.Len(t, ipVals, 1) {
assert.Equal(t, ipv6p1, ipVals[0])
}
}
})
t.Run("txt-record", func(t *testing.T) {
dtyp := dns.TypeTXT
host := path.Base(t.Name())
res, err := f.CheckHostRules(host, dtyp, setts)
assert.Nil(t, err)
if dnsrr := res.DNSRewriteResult; assert.NotNil(t, dnsrr) {
assert.Equal(t, dns.RcodeSuccess, dnsrr.RCode)
if strVals := dnsrr.Response[dtyp]; assert.Len(t, strVals, 1) {
assert.Equal(t, "hello-world", strVals[0])
}
}
})
t.Run("refused", func(t *testing.T) {
host := path.Base(t.Name())
res, err := f.CheckHostRules(host, dns.TypeA, setts)
assert.Nil(t, err)
if dnsrr := res.DNSRewriteResult; assert.NotNil(t, dnsrr) {
assert.Equal(t, dns.RcodeRefused, dnsrr.RCode)
}
})
t.Run("a-records", func(t *testing.T) {
dtyp := dns.TypeA
host := path.Base(t.Name())
res, err := f.CheckHostRules(host, dtyp, setts)
assert.Nil(t, err)
if dnsrr := res.DNSRewriteResult; assert.NotNil(t, dnsrr) {
assert.Equal(t, dns.RcodeSuccess, dnsrr.RCode)
if ipVals := dnsrr.Response[dtyp]; assert.Len(t, ipVals, 2) {
assert.Equal(t, ipv4p1, ipVals[0])
assert.Equal(t, ipv4p2, ipVals[1])
</s> add testCasesA := []struct {
name string
dtyp uint16
rcode int
want []interface{}
}{{
name: "a-record",
dtyp: dns.TypeA,
rcode: dns.RcodeSuccess,
want: []interface{}{ipv4p1},
}, {
name: "aaaa-record",
dtyp: dns.TypeAAAA,
rcode: dns.RcodeSuccess,
want: []interface{}{ipv6p1},
}, {
name: "txt-record",
dtyp: dns.TypeTXT,
rcode: dns.RcodeSuccess,
want: []interface{}{"hello-world"},
}, {
name: "refused",
rcode: dns.RcodeRefused,
}, {
name: "a-records",
dtyp: dns.TypeA,
rcode: dns.RcodeSuccess,
want: []interface{}{ipv4p1, ipv4p2},
}, {
name: "aaaa-records",
dtyp: dns.TypeAAAA,
rcode: dns.RcodeSuccess,
want: []interface{}{ipv6p1, ipv6p2},
}, {
name: "disable-one",
dtyp: dns.TypeA,
rcode: dns.RcodeSuccess,
want: []interface{}{ipv4p2},
}, {
name: "disable-cname",
dtyp: dns.TypeA,
rcode: dns.RcodeSuccess,
want: []interface{}{ipv4p1},
}}
for _, tc := range testCasesA {
t.Run(tc.name, func(t *testing.T) {
host := path.Base(tc.name)
res, err := f.CheckHostRules(host, tc.dtyp, setts)
require.Nil(t, err)
dnsrr := res.DNSRewriteResult
require.NotNil(t, dnsrr)
assert.Equal(t, tc.rcode, dnsrr.RCode)
if tc.rcode == dns.RcodeRefused {
return </s> remove if assert.Len(t, res.Rules, 1) {
assert.Equal(t, res.Rules[0].IP, net.IP{0, 0, 0, 1})
}
</s> add require.Len(t, res.Rules, 1)
assert.Equal(t, res.Rules[0].IP, net.IP{0, 0, 0, 1}) </s> remove // exception for AAAA record
d.Rewrites = []RewriteEntry{
{"host.com", "1.2.3.4", 0, nil},
{"host.com", "AAAA", 0, nil},
{"host2.com", "::1", 0, nil},
{"host2.com", "A", 0, nil},
{"host3.com", "A", 0, nil},
}
</s> add // Exception for AAAA record.
d.Rewrites = []RewriteEntry{{
Domain: "host.com",
Answer: "1.2.3.4",
}, {
Domain: "host.com",
Answer: "AAAA",
}, {
Domain: "host2.com",
Answer: "::1",
}, {
Domain: "host2.com",
Answer: "A",
}, {
Domain: "host3.com",
Answer: "A",
}} | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/dnsrewrite_test.go |
require.Nil(t, err) | <mask> res := makeRes(dns.RcodeNameError, 0, nil)
<mask> d := &proxy.DNSContext{}
<mask>
<mask> err := srv.filterDNSRewrite(req, res, d)
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, dns.RcodeNameError, d.Res.Rcode)
<mask> })
<mask>
<mask> t.Run("noerror_empty", func(t *testing.T) {
<mask> req := makeQ(dns.TypeA)
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/dnsrewrite_test.go |
require.Nil(t, err) | <mask> res := makeRes(dns.RcodeSuccess, 0, nil)
<mask> d := &proxy.DNSContext{}
<mask>
<mask> err := srv.filterDNSRewrite(req, res, d)
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, dns.RcodeSuccess, d.Res.Rcode)
<mask> assert.Empty(t, d.Res.Answer)
<mask> })
<mask>
<mask> t.Run("noerror_a", func(t *testing.T) {
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/dnsrewrite_test.go |
require.Nil(t, err) | <mask> res := makeRes(dns.RcodeSuccess, dns.TypeA, ip4)
<mask> d := &proxy.DNSContext{}
<mask>
<mask> err := srv.filterDNSRewrite(req, res, d)
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, dns.RcodeSuccess, d.Res.Rcode)
<mask> if assert.Len(t, d.Res.Answer, 1) {
<mask> assert.Equal(t, ip4, d.Res.Answer[0].(*dns.A).A)
<mask> }
<mask> })
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove if assert.Len(t, d.Res.Answer, 1) {
assert.Equal(t, ip4, d.Res.Answer[0].(*dns.A).A)
}
</s> add require.Len(t, d.Res.Answer, 1)
assert.Equal(t, ip4, d.Res.Answer[0].(*dns.A).A) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/dnsrewrite_test.go |
require.Len(t, d.Res.Answer, 1)
assert.Equal(t, ip4, d.Res.Answer[0].(*dns.A).A) | <mask>
<mask> err := srv.filterDNSRewrite(req, res, d)
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, dns.RcodeSuccess, d.Res.Rcode)
<mask> if assert.Len(t, d.Res.Answer, 1) {
<mask> assert.Equal(t, ip4, d.Res.Answer[0].(*dns.A).A)
<mask> }
<mask> })
<mask>
<mask> t.Run("noerror_aaaa", func(t *testing.T) {
<mask> req := makeQ(dns.TypeAAAA)
<mask> res := makeRes(dns.RcodeSuccess, dns.TypeAAAA, ip6)
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove if assert.Len(t, d.Res.Answer, 1) {
assert.Equal(t, []string{domain}, d.Res.Answer[0].(*dns.TXT).Txt)
}
</s> add require.Len(t, d.Res.Answer, 1)
assert.Equal(t, []string{domain}, d.Res.Answer[0].(*dns.TXT).Txt) </s> remove if assert.Len(t, d.Res.Answer, 1) {
assert.Equal(t, domain, d.Res.Answer[0].(*dns.PTR).Ptr)
}
</s> add require.Len(t, d.Res.Answer, 1)
assert.Equal(t, domain, d.Res.Answer[0].(*dns.PTR).Ptr) </s> remove if assert.Len(t, d.Res.Answer, 1) {
assert.Equal(t, ip6, d.Res.Answer[0].(*dns.AAAA).AAAA)
}
</s> add require.Len(t, d.Res.Answer, 1)
assert.Equal(t, ip6, d.Res.Answer[0].(*dns.AAAA).AAAA) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/dnsrewrite_test.go |
require.Nil(t, err) | <mask> res := makeRes(dns.RcodeSuccess, dns.TypeAAAA, ip6)
<mask> d := &proxy.DNSContext{}
<mask>
<mask> err := srv.filterDNSRewrite(req, res, d)
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, dns.RcodeSuccess, d.Res.Rcode)
<mask> if assert.Len(t, d.Res.Answer, 1) {
<mask> assert.Equal(t, ip6, d.Res.Answer[0].(*dns.AAAA).AAAA)
<mask> }
<mask> })
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove if assert.Len(t, d.Res.Answer, 1) {
assert.Equal(t, ip6, d.Res.Answer[0].(*dns.AAAA).AAAA)
}
</s> add require.Len(t, d.Res.Answer, 1)
assert.Equal(t, ip6, d.Res.Answer[0].(*dns.AAAA).AAAA) </s> remove if assert.Len(t, d.Res.Answer, 1) {
assert.Equal(t, ip4, d.Res.Answer[0].(*dns.A).A)
}
</s> add require.Len(t, d.Res.Answer, 1)
assert.Equal(t, ip4, d.Res.Answer[0].(*dns.A).A) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/dnsrewrite_test.go |
require.Len(t, d.Res.Answer, 1)
assert.Equal(t, ip6, d.Res.Answer[0].(*dns.AAAA).AAAA) | <mask>
<mask> err := srv.filterDNSRewrite(req, res, d)
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, dns.RcodeSuccess, d.Res.Rcode)
<mask> if assert.Len(t, d.Res.Answer, 1) {
<mask> assert.Equal(t, ip6, d.Res.Answer[0].(*dns.AAAA).AAAA)
<mask> }
<mask> })
<mask>
<mask> t.Run("noerror_ptr", func(t *testing.T) {
<mask> req := makeQ(dns.TypePTR)
<mask> res := makeRes(dns.RcodeSuccess, dns.TypePTR, domain)
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove if assert.Len(t, d.Res.Answer, 1) {
assert.Equal(t, domain, d.Res.Answer[0].(*dns.PTR).Ptr)
}
</s> add require.Len(t, d.Res.Answer, 1)
assert.Equal(t, domain, d.Res.Answer[0].(*dns.PTR).Ptr) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove if assert.Len(t, d.Res.Answer, 1) {
assert.Equal(t, ip4, d.Res.Answer[0].(*dns.A).A)
}
</s> add require.Len(t, d.Res.Answer, 1)
assert.Equal(t, ip4, d.Res.Answer[0].(*dns.A).A) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/dnsrewrite_test.go |
require.Nil(t, err) | <mask> res := makeRes(dns.RcodeSuccess, dns.TypePTR, domain)
<mask> d := &proxy.DNSContext{}
<mask>
<mask> err := srv.filterDNSRewrite(req, res, d)
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, dns.RcodeSuccess, d.Res.Rcode)
<mask> if assert.Len(t, d.Res.Answer, 1) {
<mask> assert.Equal(t, domain, d.Res.Answer[0].(*dns.PTR).Ptr)
<mask> }
<mask> })
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove if assert.Len(t, d.Res.Answer, 1) {
assert.Equal(t, domain, d.Res.Answer[0].(*dns.PTR).Ptr)
}
</s> add require.Len(t, d.Res.Answer, 1)
assert.Equal(t, domain, d.Res.Answer[0].(*dns.PTR).Ptr) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove if assert.Len(t, d.Res.Answer, 1) {
assert.Equal(t, ip6, d.Res.Answer[0].(*dns.AAAA).AAAA)
}
</s> add require.Len(t, d.Res.Answer, 1)
assert.Equal(t, ip6, d.Res.Answer[0].(*dns.AAAA).AAAA) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/dnsrewrite_test.go |
require.Len(t, d.Res.Answer, 1)
assert.Equal(t, domain, d.Res.Answer[0].(*dns.PTR).Ptr) | <mask>
<mask> err := srv.filterDNSRewrite(req, res, d)
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, dns.RcodeSuccess, d.Res.Rcode)
<mask> if assert.Len(t, d.Res.Answer, 1) {
<mask> assert.Equal(t, domain, d.Res.Answer[0].(*dns.PTR).Ptr)
<mask> }
<mask> })
<mask>
<mask> t.Run("noerror_txt", func(t *testing.T) {
<mask> req := makeQ(dns.TypeTXT)
<mask> res := makeRes(dns.RcodeSuccess, dns.TypeTXT, domain)
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove if assert.Len(t, d.Res.Answer, 1) {
assert.Equal(t, ip6, d.Res.Answer[0].(*dns.AAAA).AAAA)
}
</s> add require.Len(t, d.Res.Answer, 1)
assert.Equal(t, ip6, d.Res.Answer[0].(*dns.AAAA).AAAA) </s> remove if assert.Len(t, d.Res.Answer, 1) {
assert.Equal(t, []string{domain}, d.Res.Answer[0].(*dns.TXT).Txt)
}
</s> add require.Len(t, d.Res.Answer, 1)
assert.Equal(t, []string{domain}, d.Res.Answer[0].(*dns.TXT).Txt) </s> remove if assert.Len(t, d.Res.Answer, 1) {
assert.Equal(t, ip4, d.Res.Answer[0].(*dns.A).A)
}
</s> add require.Len(t, d.Res.Answer, 1)
assert.Equal(t, ip4, d.Res.Answer[0].(*dns.A).A) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/dnsrewrite_test.go |
require.Nil(t, err) | <mask> res := makeRes(dns.RcodeSuccess, dns.TypeTXT, domain)
<mask> d := &proxy.DNSContext{}
<mask>
<mask> err := srv.filterDNSRewrite(req, res, d)
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, dns.RcodeSuccess, d.Res.Rcode)
<mask> if assert.Len(t, d.Res.Answer, 1) {
<mask> assert.Equal(t, []string{domain}, d.Res.Answer[0].(*dns.TXT).Txt)
<mask> }
<mask> })
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove if assert.Len(t, d.Res.Answer, 1) {
assert.Equal(t, []string{domain}, d.Res.Answer[0].(*dns.TXT).Txt)
}
</s> add require.Len(t, d.Res.Answer, 1)
assert.Equal(t, []string{domain}, d.Res.Answer[0].(*dns.TXT).Txt) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove if assert.Len(t, d.Res.Answer, 1) {
assert.Equal(t, domain, d.Res.Answer[0].(*dns.PTR).Ptr)
}
</s> add require.Len(t, d.Res.Answer, 1)
assert.Equal(t, domain, d.Res.Answer[0].(*dns.PTR).Ptr) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/dnsrewrite_test.go |
require.Len(t, d.Res.Answer, 1)
assert.Equal(t, []string{domain}, d.Res.Answer[0].(*dns.TXT).Txt) | <mask>
<mask> err := srv.filterDNSRewrite(req, res, d)
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, dns.RcodeSuccess, d.Res.Rcode)
<mask> if assert.Len(t, d.Res.Answer, 1) {
<mask> assert.Equal(t, []string{domain}, d.Res.Answer[0].(*dns.TXT).Txt)
<mask> }
<mask> })
<mask>
<mask> t.Run("noerror_mx", func(t *testing.T) {
<mask> req := makeQ(dns.TypeMX)
<mask> res := makeRes(dns.RcodeSuccess, dns.TypeMX, mx)
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove if assert.Len(t, d.Res.Answer, 1) {
assert.Equal(t, ip4, d.Res.Answer[0].(*dns.A).A)
}
</s> add require.Len(t, d.Res.Answer, 1)
assert.Equal(t, ip4, d.Res.Answer[0].(*dns.A).A) </s> remove if assert.Len(t, d.Res.Answer, 1) {
assert.Equal(t, ip6, d.Res.Answer[0].(*dns.AAAA).AAAA)
}
</s> add require.Len(t, d.Res.Answer, 1)
assert.Equal(t, ip6, d.Res.Answer[0].(*dns.AAAA).AAAA) </s> remove if assert.Len(t, d.Res.Answer, 1) {
assert.Equal(t, domain, d.Res.Answer[0].(*dns.PTR).Ptr)
}
</s> add require.Len(t, d.Res.Answer, 1)
assert.Equal(t, domain, d.Res.Answer[0].(*dns.PTR).Ptr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/dnsrewrite_test.go |
require.Nil(t, err) | <mask> res := makeRes(dns.RcodeSuccess, dns.TypeMX, mx)
<mask> d := &proxy.DNSContext{}
<mask>
<mask> err := srv.filterDNSRewrite(req, res, d)
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, dns.RcodeSuccess, d.Res.Rcode)
<mask> if assert.Len(t, d.Res.Answer, 1) {
<mask> ans, ok := d.Res.Answer[0].(*dns.MX)
<mask> if assert.True(t, ok) {
<mask> assert.Equal(t, mx.Exchange, ans.Mx)
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove if assert.Len(t, d.Res.Answer, 1) {
ans, ok := d.Res.Answer[0].(*dns.MX)
if assert.True(t, ok) {
assert.Equal(t, mx.Exchange, ans.Mx)
assert.Equal(t, mx.Preference, ans.Preference)
}
}
</s> add require.Len(t, d.Res.Answer, 1)
ans, ok := d.Res.Answer[0].(*dns.MX)
require.True(t, ok)
assert.Equal(t, mx.Exchange, ans.Mx)
assert.Equal(t, mx.Preference, ans.Preference) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove if assert.Len(t, d.Res.Answer, 1) {
assert.Equal(t, []string{domain}, d.Res.Answer[0].(*dns.TXT).Txt)
}
</s> add require.Len(t, d.Res.Answer, 1)
assert.Equal(t, []string{domain}, d.Res.Answer[0].(*dns.TXT).Txt) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/dnsrewrite_test.go |
require.Len(t, d.Res.Answer, 1)
ans, ok := d.Res.Answer[0].(*dns.MX)
require.True(t, ok)
assert.Equal(t, mx.Exchange, ans.Mx)
assert.Equal(t, mx.Preference, ans.Preference) | <mask>
<mask> err := srv.filterDNSRewrite(req, res, d)
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, dns.RcodeSuccess, d.Res.Rcode)
<mask> if assert.Len(t, d.Res.Answer, 1) {
<mask> ans, ok := d.Res.Answer[0].(*dns.MX)
<mask> if assert.True(t, ok) {
<mask> assert.Equal(t, mx.Exchange, ans.Mx)
<mask> assert.Equal(t, mx.Preference, ans.Preference)
<mask> }
<mask> }
<mask> })
<mask>
<mask> t.Run("noerror_svcb", func(t *testing.T) {
<mask> req := makeQ(dns.TypeSVCB)
<mask> res := makeRes(dns.RcodeSuccess, dns.TypeSVCB, svcb)
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove if assert.Len(t, d.Res.Answer, 1) {
ans, ok := d.Res.Answer[0].(*dns.SVCB)
if assert.True(t, ok) {
assert.Equal(t, dns.SVCB_ALPN, ans.Value[0].Key())
assert.Equal(t, svcb.Params["alpn"], ans.Value[0].String())
assert.Equal(t, svcb.Target, ans.Target)
assert.Equal(t, svcb.Priority, ans.Priority)
}
}
</s> add require.Len(t, d.Res.Answer, 1)
ans, ok := d.Res.Answer[0].(*dns.SVCB)
require.True(t, ok)
assert.Equal(t, dns.SVCB_ALPN, ans.Value[0].Key())
assert.Equal(t, svcb.Params["alpn"], ans.Value[0].String())
assert.Equal(t, svcb.Target, ans.Target)
assert.Equal(t, svcb.Priority, ans.Priority) </s> remove if assert.Len(t, d.Res.Answer, 1) {
assert.Equal(t, ip4, d.Res.Answer[0].(*dns.A).A)
}
</s> add require.Len(t, d.Res.Answer, 1)
assert.Equal(t, ip4, d.Res.Answer[0].(*dns.A).A) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/dnsrewrite_test.go |
require.Nil(t, err) | <mask> res := makeRes(dns.RcodeSuccess, dns.TypeSVCB, svcb)
<mask> d := &proxy.DNSContext{}
<mask>
<mask> err := srv.filterDNSRewrite(req, res, d)
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, dns.RcodeSuccess, d.Res.Rcode)
<mask> if assert.Len(t, d.Res.Answer, 1) {
<mask> ans, ok := d.Res.Answer[0].(*dns.SVCB)
<mask> if assert.True(t, ok) {
<mask> assert.Equal(t, dns.SVCB_ALPN, ans.Value[0].Key())
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove if assert.Len(t, d.Res.Answer, 1) {
ans, ok := d.Res.Answer[0].(*dns.SVCB)
if assert.True(t, ok) {
assert.Equal(t, dns.SVCB_ALPN, ans.Value[0].Key())
assert.Equal(t, svcb.Params["alpn"], ans.Value[0].String())
assert.Equal(t, svcb.Target, ans.Target)
assert.Equal(t, svcb.Priority, ans.Priority)
}
}
</s> add require.Len(t, d.Res.Answer, 1)
ans, ok := d.Res.Answer[0].(*dns.SVCB)
require.True(t, ok)
assert.Equal(t, dns.SVCB_ALPN, ans.Value[0].Key())
assert.Equal(t, svcb.Params["alpn"], ans.Value[0].String())
assert.Equal(t, svcb.Target, ans.Target)
assert.Equal(t, svcb.Priority, ans.Priority) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove if assert.Len(t, d.Res.Answer, 1) {
ans, ok := d.Res.Answer[0].(*dns.MX)
if assert.True(t, ok) {
assert.Equal(t, mx.Exchange, ans.Mx)
assert.Equal(t, mx.Preference, ans.Preference)
}
}
</s> add require.Len(t, d.Res.Answer, 1)
ans, ok := d.Res.Answer[0].(*dns.MX)
require.True(t, ok)
assert.Equal(t, mx.Exchange, ans.Mx)
assert.Equal(t, mx.Preference, ans.Preference) </s> remove if assert.Len(t, d.Res.Answer, 1) {
ans, ok := d.Res.Answer[0].(*dns.HTTPS)
if assert.True(t, ok) {
assert.Equal(t, dns.SVCB_ALPN, ans.Value[0].Key())
assert.Equal(t, svcb.Params["alpn"], ans.Value[0].String())
assert.Equal(t, svcb.Target, ans.Target)
assert.Equal(t, svcb.Priority, ans.Priority)
}
}
</s> add require.Len(t, d.Res.Answer, 1)
ans, ok := d.Res.Answer[0].(*dns.HTTPS)
require.True(t, ok)
assert.Equal(t, dns.SVCB_ALPN, ans.Value[0].Key())
assert.Equal(t, svcb.Params["alpn"], ans.Value[0].String())
assert.Equal(t, svcb.Target, ans.Target)
assert.Equal(t, svcb.Priority, ans.Priority) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/dnsrewrite_test.go |
require.Len(t, d.Res.Answer, 1)
ans, ok := d.Res.Answer[0].(*dns.SVCB)
require.True(t, ok)
assert.Equal(t, dns.SVCB_ALPN, ans.Value[0].Key())
assert.Equal(t, svcb.Params["alpn"], ans.Value[0].String())
assert.Equal(t, svcb.Target, ans.Target)
assert.Equal(t, svcb.Priority, ans.Priority) | <mask>
<mask> err := srv.filterDNSRewrite(req, res, d)
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, dns.RcodeSuccess, d.Res.Rcode)
<mask> if assert.Len(t, d.Res.Answer, 1) {
<mask> ans, ok := d.Res.Answer[0].(*dns.SVCB)
<mask> if assert.True(t, ok) {
<mask> assert.Equal(t, dns.SVCB_ALPN, ans.Value[0].Key())
<mask> assert.Equal(t, svcb.Params["alpn"], ans.Value[0].String())
<mask> assert.Equal(t, svcb.Target, ans.Target)
<mask> assert.Equal(t, svcb.Priority, ans.Priority)
<mask> }
<mask> }
<mask> })
<mask>
<mask> t.Run("noerror_https", func(t *testing.T) {
<mask> req := makeQ(dns.TypeHTTPS)
<mask> res := makeRes(dns.RcodeSuccess, dns.TypeHTTPS, svcb)
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove if assert.Len(t, d.Res.Answer, 1) {
ans, ok := d.Res.Answer[0].(*dns.HTTPS)
if assert.True(t, ok) {
assert.Equal(t, dns.SVCB_ALPN, ans.Value[0].Key())
assert.Equal(t, svcb.Params["alpn"], ans.Value[0].String())
assert.Equal(t, svcb.Target, ans.Target)
assert.Equal(t, svcb.Priority, ans.Priority)
}
}
</s> add require.Len(t, d.Res.Answer, 1)
ans, ok := d.Res.Answer[0].(*dns.HTTPS)
require.True(t, ok)
assert.Equal(t, dns.SVCB_ALPN, ans.Value[0].Key())
assert.Equal(t, svcb.Params["alpn"], ans.Value[0].String())
assert.Equal(t, svcb.Target, ans.Target)
assert.Equal(t, svcb.Priority, ans.Priority) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove if assert.Len(t, d.Res.Answer, 1) {
ans, ok := d.Res.Answer[0].(*dns.MX)
if assert.True(t, ok) {
assert.Equal(t, mx.Exchange, ans.Mx)
assert.Equal(t, mx.Preference, ans.Preference)
}
}
</s> add require.Len(t, d.Res.Answer, 1)
ans, ok := d.Res.Answer[0].(*dns.MX)
require.True(t, ok)
assert.Equal(t, mx.Exchange, ans.Mx)
assert.Equal(t, mx.Preference, ans.Preference) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/dnsrewrite_test.go |
require.Nil(t, err) | <mask> res := makeRes(dns.RcodeSuccess, dns.TypeHTTPS, svcb)
<mask> d := &proxy.DNSContext{}
<mask>
<mask> err := srv.filterDNSRewrite(req, res, d)
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, dns.RcodeSuccess, d.Res.Rcode)
<mask> if assert.Len(t, d.Res.Answer, 1) {
<mask> ans, ok := d.Res.Answer[0].(*dns.HTTPS)
<mask> if assert.True(t, ok) {
<mask> assert.Equal(t, dns.SVCB_ALPN, ans.Value[0].Key())
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove if assert.Len(t, d.Res.Answer, 1) {
ans, ok := d.Res.Answer[0].(*dns.SVCB)
if assert.True(t, ok) {
assert.Equal(t, dns.SVCB_ALPN, ans.Value[0].Key())
assert.Equal(t, svcb.Params["alpn"], ans.Value[0].String())
assert.Equal(t, svcb.Target, ans.Target)
assert.Equal(t, svcb.Priority, ans.Priority)
}
}
</s> add require.Len(t, d.Res.Answer, 1)
ans, ok := d.Res.Answer[0].(*dns.SVCB)
require.True(t, ok)
assert.Equal(t, dns.SVCB_ALPN, ans.Value[0].Key())
assert.Equal(t, svcb.Params["alpn"], ans.Value[0].String())
assert.Equal(t, svcb.Target, ans.Target)
assert.Equal(t, svcb.Priority, ans.Priority) </s> remove if assert.Len(t, d.Res.Answer, 1) {
ans, ok := d.Res.Answer[0].(*dns.HTTPS)
if assert.True(t, ok) {
assert.Equal(t, dns.SVCB_ALPN, ans.Value[0].Key())
assert.Equal(t, svcb.Params["alpn"], ans.Value[0].String())
assert.Equal(t, svcb.Target, ans.Target)
assert.Equal(t, svcb.Priority, ans.Priority)
}
}
</s> add require.Len(t, d.Res.Answer, 1)
ans, ok := d.Res.Answer[0].(*dns.HTTPS)
require.True(t, ok)
assert.Equal(t, dns.SVCB_ALPN, ans.Value[0].Key())
assert.Equal(t, svcb.Params["alpn"], ans.Value[0].String())
assert.Equal(t, svcb.Target, ans.Target)
assert.Equal(t, svcb.Priority, ans.Priority) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove if assert.Len(t, d.Res.Answer, 1) {
ans, ok := d.Res.Answer[0].(*dns.MX)
if assert.True(t, ok) {
assert.Equal(t, mx.Exchange, ans.Mx)
assert.Equal(t, mx.Preference, ans.Preference)
}
}
</s> add require.Len(t, d.Res.Answer, 1)
ans, ok := d.Res.Answer[0].(*dns.MX)
require.True(t, ok)
assert.Equal(t, mx.Exchange, ans.Mx)
assert.Equal(t, mx.Preference, ans.Preference) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/dnsrewrite_test.go |
require.Len(t, d.Res.Answer, 1)
ans, ok := d.Res.Answer[0].(*dns.HTTPS)
require.True(t, ok)
assert.Equal(t, dns.SVCB_ALPN, ans.Value[0].Key())
assert.Equal(t, svcb.Params["alpn"], ans.Value[0].String())
assert.Equal(t, svcb.Target, ans.Target)
assert.Equal(t, svcb.Priority, ans.Priority) | <mask>
<mask> err := srv.filterDNSRewrite(req, res, d)
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, dns.RcodeSuccess, d.Res.Rcode)
<mask> if assert.Len(t, d.Res.Answer, 1) {
<mask> ans, ok := d.Res.Answer[0].(*dns.HTTPS)
<mask> if assert.True(t, ok) {
<mask> assert.Equal(t, dns.SVCB_ALPN, ans.Value[0].Key())
<mask> assert.Equal(t, svcb.Params["alpn"], ans.Value[0].String())
<mask> assert.Equal(t, svcb.Target, ans.Target)
<mask> assert.Equal(t, svcb.Priority, ans.Priority)
<mask> }
<mask> }
<mask> })
<mask> }
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove if assert.Len(t, d.Res.Answer, 1) {
ans, ok := d.Res.Answer[0].(*dns.SVCB)
if assert.True(t, ok) {
assert.Equal(t, dns.SVCB_ALPN, ans.Value[0].Key())
assert.Equal(t, svcb.Params["alpn"], ans.Value[0].String())
assert.Equal(t, svcb.Target, ans.Target)
assert.Equal(t, svcb.Priority, ans.Priority)
}
}
</s> add require.Len(t, d.Res.Answer, 1)
ans, ok := d.Res.Answer[0].(*dns.SVCB)
require.True(t, ok)
assert.Equal(t, dns.SVCB_ALPN, ans.Value[0].Key())
assert.Equal(t, svcb.Params["alpn"], ans.Value[0].String())
assert.Equal(t, svcb.Target, ans.Target)
assert.Equal(t, svcb.Priority, ans.Priority) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove if assert.Len(t, d.Res.Answer, 1) {
ans, ok := d.Res.Answer[0].(*dns.MX)
if assert.True(t, ok) {
assert.Equal(t, mx.Exchange, ans.Mx)
assert.Equal(t, mx.Preference, ans.Preference)
}
}
</s> add require.Len(t, d.Res.Answer, 1)
ans, ok := d.Res.Answer[0].(*dns.MX)
require.True(t, ok)
assert.Equal(t, mx.Exchange, ans.Mx)
assert.Equal(t, mx.Preference, ans.Preference) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/dnsrewrite_test.go |
"github.com/stretchr/testify/require" | <mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/stretchr/testify/assert"
<mask> )
<mask>
<mask> func TestDNSForwardHTTTP_handleGetConfig(t *testing.T) {
<mask> filterConf := &dnsfilter.Config{
<mask> SafeBrowsingEnabled: true,
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove ans, _ := (&aghtest.TestResolver{}).HostToIPs(hostname)
</s> add ans4, _ := (&aghtest.TestResolver{}).HostToIPs(hostname) </s> remove w.Body.Reset()
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/http_test.go |
require.Nil(t, s.Start())
t.Cleanup(func() {
require.Nil(t, s.Stop())
}) | <mask> },
<mask> ConfigModified: func() {},
<mask> }
<mask> s := createTestServer(t, filterConf, forwardConf)
<mask> err := s.Start()
<mask> assert.Nil(t, err)
<mask> defer assert.Nil(t, s.Stop())
<mask>
<mask> defaultConf := s.conf
<mask>
<mask> w := httptest.NewRecorder()
<mask>
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove SafeBrowsingBlockHost: ans.String(),
</s> add SafeBrowsingBlockHost: ans4.String(), </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove l := testStartFilterListener()
defer func() { _ = l.Close() }()
dir := prepareTestDir()
defer func() { _ = os.RemoveAll(dir) }()
Context = homeContext{}
Context.workDir = dir
Context.client = &http.Client{
Timeout: 5 * time.Second,
</s> add l := testStartFilterListener(t)
dir := prepareTestDir(t)
Context = homeContext{
workDir: dir,
client: &http.Client{
Timeout: 5 * time.Second,
}, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/http_test.go |
t.Cleanup(w.Body.Reset)
| <mask>
<mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> s.conf = tc.conf()
<mask> s.handleGetConfig(w, nil)
<mask>
<mask> assert.Equal(t, "application/json", w.Header().Get("Content-Type"))
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.Equal(t, tc.want, w.Body.String())
</s> add </s> remove assert.Equal(t, tc.valid, err == nil)
if err == nil {
</s> add require.Equal(t, tc.valid, err == nil)
if tc.valid { </s> remove assert.Nil(t, err, err)
</s> add require.Nil(t, err) </s> remove if werr != nil {
panic(werr)
}
</s> add require.Nil(t, werr) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/http_test.go |
<mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> s.conf = tc.conf()
<mask> s.handleGetConfig(w, nil)
<mask> assert.Equal(t, tc.want, w.Body.String())
<mask>
<mask> assert.Equal(t, "application/json", w.Header().Get("Content-Type"))
<mask> })
<mask> w.Body.Reset()
<mask> }
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove w.Body.Reset()
</s> add </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove s.conf = defaultConf
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/http_test.go | |
assert.Equal(t, tc.want, w.Body.String()) | <mask>
<mask> assert.Equal(t, "application/json", w.Header().Get("Content-Type"))
<mask> })
<mask> }
<mask> }
<mask>
<mask> func TestDNSForwardHTTTP_handleSetConfig(t *testing.T) {
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove w.Body.Reset()
</s> add </s> remove assert.Equal(t, tc.want, w.Body.String())
</s> add </s> remove
func TestSerializeEmpty(t *testing.T) {
testSerialize(t, options{})
}
func TestSerializeConfigFilename(t *testing.T) {
testSerialize(t, options{configFilename: "path"}, "-c", "path")
}
func TestSerializeWorkDir(t *testing.T) {
testSerialize(t, options{workDir: "path"}, "-w", "path")
}
func TestSerializeBindHost(t *testing.T) {
testSerialize(t, options{bindHost: net.IP{1, 2, 3, 4}}, "-h", "1.2.3.4")
}
func TestSerializeBindPort(t *testing.T) {
testSerialize(t, options{bindPort: 666}, "-p", "666")
}
func TestSerializeLogfile(t *testing.T) {
testSerialize(t, options{logFile: "path"}, "-l", "path")
}
func TestSerializePidfile(t *testing.T) {
testSerialize(t, options{pidFile: "path"}, "--pidfile", "path")
}
func TestSerializeCheckConfig(t *testing.T) {
testSerialize(t, options{checkConfig: true}, "--check-config")
}
func TestSerializeDisableUpdate(t *testing.T) {
testSerialize(t, options{disableUpdate: true}, "--no-check-update")
}
func TestSerializeService(t *testing.T) {
testSerialize(t, options{serviceControlAction: "run"}, "-s", "run")
}
func TestSerializeGLInet(t *testing.T) {
testSerialize(t, options{glinetMode: true}, "--glinet")
}
func TestSerializeDisableMemoryOptimization(t *testing.T) {
testSerialize(t, options{disableMemoryOptimization: true}, "--no-mem-optimization")
}
func TestSerializeMultiple(t *testing.T) {
testSerialize(t, options{
serviceControlAction: "run",
configFilename: "config",
workDir: "work",
pidFile: "pid",
disableUpdate: true,
disableMemoryOptimization: true,
}, "-c", "config", "-w", "work", "-s", "run", "--pidfile", "pid", "--no-check-update", "--no-mem-optimization")
}
</s> add </s> remove if assert.Len(t, res.Rules, 1) {
assert.NotEqual(t, res.Rules[0].IP.String(), "0.0.0.0")
}
</s> add require.Len(t, res.Rules, 1)
assert.Equal(t, ip, res.Rules[0].IP) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/http_test.go |
<mask> assert.Equal(t, tc.want, w.Body.String())
<mask>
<mask> assert.Equal(t, "application/json", w.Header().Get("Content-Type"))
<mask> })
<mask> w.Body.Reset()
<mask> }
<mask> }
<mask>
<mask> func TestDNSForwardHTTTP_handleSetConfig(t *testing.T) {
<mask> filterConf := &dnsfilter.Config{
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.Equal(t, tc.want, w.Body.String())
</s> add </s> remove s.conf = defaultConf
</s> add </s> remove ans, _ := (&aghtest.TestResolver{}).HostToIPs(hostname)
</s> add ans4, _ := (&aghtest.TestResolver{}).HostToIPs(hostname) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/http_test.go | |
t.Cleanup(func() {
s.conf = defaultConf
})
| <mask> }}
<mask>
<mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> rBody := ioutil.NopCloser(strings.NewReader(tc.req))
<mask> r, err := http.NewRequest(http.MethodPost, "http://example.com", rBody)
<mask> require.Nil(t, err)
<mask>
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove assert.Nil(t, err, err)
</s> add require.Nil(t, err) </s> remove assert.Nil(t, err)
if tc.name == "first" {
assert.True(t, true)
}
</s> add require.Nil(t, err) </s> remove handler := makeHandler(&err)
</s> add handler := makeHandler(t, &err) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/http_test.go |
require.Nil(t, err) | <mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> rBody := ioutil.NopCloser(strings.NewReader(tc.req))
<mask> r, err := http.NewRequest(http.MethodPost, "http://example.com", rBody)
<mask> assert.Nil(t, err)
<mask>
<mask> s.handleSetConfig(w, r)
<mask> assert.Equal(t, tc.wantSet, w.Body.String())
<mask> w.Body.Reset()
<mask>
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.Equal(t, tc.want, w.Body.String())
</s> add </s> remove assert.Nil(t, err, err)
</s> add require.Nil(t, err) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove handler := makeHandler(&err)
</s> add handler := makeHandler(t, &err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/http_test.go |
<mask> s.handleGetConfig(w, nil)
<mask> assert.Equal(t, tc.wantGet, w.Body.String())
<mask> w.Body.Reset()
<mask> })
<mask> s.conf = defaultConf
<mask> }
<mask> }
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.Equal(t, tc.want, w.Body.String())
</s> add </s> remove w.Body.Reset()
</s> add </s> remove err := s.Start()
assert.Nil(t, err)
defer assert.Nil(t, s.Stop())
</s> add require.Nil(t, s.Start())
t.Cleanup(func() {
require.Nil(t, s.Stop())
}) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/http_test.go | |
"github.com/stretchr/testify/require" | <mask> "github.com/miekg/dns"
<mask> "github.com/stretchr/testify/assert"
<mask> )
<mask>
<mask> // testQueryLog is a simple querylog.QueryLog implementation for tests.
<mask> type testQueryLog struct {
<mask> // QueryLog is embedded here simply to make testQueryLog
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove // 'badhost' has a canonical name 'null.example.org' which is blocked by
// filters: but protection is disabled so response is _not_ blocked.
</s> add // 'badhost' has a canonical name 'null.example.org' which should be
// blocked by filters, but protection is disabled so it is not. | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/stats_test.go |
require.Nil(t, err) | <mask> wantStatResult: stats.RParental,
<mask> }}
<mask>
<mask> ups, err := upstream.AddressToUpstream("1.1.1.1", upstream.Options{})
<mask> assert.Nil(t, err)
<mask>
<mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> req := &dns.Msg{
<mask> Question: []dns.Question{{
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.Nil(t, err, err)
</s> add require.Nil(t, err) </s> remove handler := makeHandler(&err)
</s> add handler := makeHandler(t, &err) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsforward/stats_test.go |
func prepareTestDir(t *testing.T) string {
t.Helper()
| <mask> func TestMain(m *testing.M) {
<mask> aghtest.DiscardLogOutput(m)
<mask> }
<mask>
<mask> func prepareTestDir() string {
<mask> const dir = "./agh-test"
<mask> _ = os.RemoveAll(dir)
<mask> _ = os.MkdirAll(dir, 0o755)
<mask> return dir
<mask> }
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove _ = os.RemoveAll(dir)
_ = os.MkdirAll(dir, 0o755)
</s> add require.Nil(t, os.RemoveAll(dir))
// TODO(e.burkov): Replace with testing.TempDir after updating Go
// version to 1.16.
require.Nil(t, os.MkdirAll(dir, 0o755))
t.Cleanup(func() { require.Nil(t, os.RemoveAll(dir)) })
</s> remove dir := prepareTestDir()
defer func() { _ = os.RemoveAll(dir) }()
</s> add dir := prepareTestDir(t) </s> remove l := testStartFilterListener()
defer func() { _ = l.Close() }()
dir := prepareTestDir()
defer func() { _ = os.RemoveAll(dir) }()
Context = homeContext{}
Context.workDir = dir
Context.client = &http.Client{
Timeout: 5 * time.Second,
</s> add l := testStartFilterListener(t)
dir := prepareTestDir(t)
Context = homeContext{
workDir: dir,
client: &http.Client{
Timeout: 5 * time.Second,
}, </s> remove dir := prepareTestDir()
defer func() { _ = os.RemoveAll(dir) }()
</s> add dir := prepareTestDir(t) </s> remove dir := prepareTestDir()
t.Cleanup(func() { _ = os.RemoveAll(dir) })
</s> add dir := prepareTestDir(t) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/auth_test.go |
require.Nil(t, os.RemoveAll(dir))
// TODO(e.burkov): Replace with testing.TempDir after updating Go
// version to 1.16.
require.Nil(t, os.MkdirAll(dir, 0o755))
t.Cleanup(func() { require.Nil(t, os.RemoveAll(dir)) })
| <mask> }
<mask>
<mask> func prepareTestDir() string {
<mask> const dir = "./agh-test"
<mask> _ = os.RemoveAll(dir)
<mask> _ = os.MkdirAll(dir, 0o755)
<mask> return dir
<mask> }
<mask>
<mask> func TestNewSessionToken(t *testing.T) {
<mask> // Successful case.
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove func prepareTestDir() string {
</s> add func prepareTestDir(t *testing.T) string {
t.Helper()
</s> remove dir := prepareTestDir()
defer func() { _ = os.RemoveAll(dir) }()
</s> add dir := prepareTestDir(t) </s> remove l := testStartFilterListener()
defer func() { _ = l.Close() }()
dir := prepareTestDir()
defer func() { _ = os.RemoveAll(dir) }()
Context = homeContext{}
Context.workDir = dir
Context.client = &http.Client{
Timeout: 5 * time.Second,
</s> add l := testStartFilterListener(t)
dir := prepareTestDir(t)
Context = homeContext{
workDir: dir,
client: &http.Client{
Timeout: 5 * time.Second,
}, </s> remove dir := prepareTestDir()
defer func() { _ = os.RemoveAll(dir) }()
</s> add dir := prepareTestDir(t) </s> remove dir := prepareTestDir()
t.Cleanup(func() { _ = os.RemoveAll(dir) })
</s> add dir := prepareTestDir(t) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/auth_test.go |
dir := prepareTestDir(t) | <mask> assert.Empty(t, token)
<mask> }
<mask>
<mask> func TestAuth(t *testing.T) {
<mask> dir := prepareTestDir()
<mask> t.Cleanup(func() { _ = os.RemoveAll(dir) })
<mask> fn := filepath.Join(dir, "sessions.db")
<mask>
<mask> users := []User{{
<mask> Name: "name",
<mask> PasswordHash: "$2y$05$..vyzAECIhJPfaQiOK17IukcQnqEgKJHy0iETyYqxn3YXJl8yZuo2",
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove dir := prepareTestDir()
defer func() { _ = os.RemoveAll(dir) }()
</s> add dir := prepareTestDir(t) </s> remove dir := prepareTestDir()
defer func() { _ = os.RemoveAll(dir) }()
</s> add dir := prepareTestDir(t) </s> remove dir := prepareTestDir()
defer func() { _ = os.RemoveAll(dir) }()
</s> add dir := prepareTestDir(t) </s> remove l := testStartFilterListener()
defer func() { _ = l.Close() }()
dir := prepareTestDir()
defer func() { _ = os.RemoveAll(dir) }()
Context = homeContext{}
Context.workDir = dir
Context.client = &http.Client{
Timeout: 5 * time.Second,
</s> add l := testStartFilterListener(t)
dir := prepareTestDir(t)
Context = homeContext{
workDir: dir,
client: &http.Client{
Timeout: 5 * time.Second,
}, </s> remove func prepareTestDir() string {
</s> add func prepareTestDir(t *testing.T) string {
t.Helper()
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/auth_test.go |
dir := prepareTestDir(t) | <mask> w.statusCode = statusCode
<mask> }
<mask>
<mask> func TestAuthHTTP(t *testing.T) {
<mask> dir := prepareTestDir()
<mask> defer func() { _ = os.RemoveAll(dir) }()
<mask> fn := filepath.Join(dir, "sessions.db")
<mask>
<mask> users := []User{
<mask> {Name: "name", PasswordHash: "$2y$05$..vyzAECIhJPfaQiOK17IukcQnqEgKJHy0iETyYqxn3YXJl8yZuo2"},
<mask> }
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove dir := prepareTestDir()
t.Cleanup(func() { _ = os.RemoveAll(dir) })
</s> add dir := prepareTestDir(t) </s> remove dir := prepareTestDir()
defer func() { _ = os.RemoveAll(dir) }()
</s> add dir := prepareTestDir(t) </s> remove dir := prepareTestDir()
defer func() { _ = os.RemoveAll(dir) }()
</s> add dir := prepareTestDir(t) </s> remove l := testStartFilterListener()
defer func() { _ = l.Close() }()
dir := prepareTestDir()
defer func() { _ = os.RemoveAll(dir) }()
Context = homeContext{}
Context.workDir = dir
Context.client = &http.Client{
Timeout: 5 * time.Second,
</s> add l := testStartFilterListener(t)
dir := prepareTestDir(t)
Context = homeContext{
workDir: dir,
client: &http.Client{
Timeout: 5 * time.Second,
}, </s> remove func prepareTestDir() string {
</s> add func prepareTestDir(t *testing.T) string {
t.Helper()
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/auth_test.go |
<mask> import (
<mask> "encoding/binary"
<mask> "io/ioutil"
<mask> "net/http"
<mask> "os"
<mask> "testing"
<mask> "time"
<mask>
<mask> "github.com/stretchr/testify/assert"
<mask> )
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove )
/* Tests performed:
. Bad certificate
. Bad private key
. Valid certificate & private key */
func TestValidateCertificates(t *testing.T) {
var data tlsConfigStatus
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/authglinet_test.go | |
"github.com/stretchr/testify/require" | <mask> "time"
<mask>
<mask> "github.com/stretchr/testify/assert"
<mask> )
<mask>
<mask> func TestAuthGL(t *testing.T) {
<mask> dir := prepareTestDir(t)
<mask>
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove dir := prepareTestDir()
defer func() { _ = os.RemoveAll(dir) }()
</s> add dir := prepareTestDir(t) </s> remove dir := prepareTestDir()
t.Cleanup(func() { _ = os.RemoveAll(dir) })
</s> add dir := prepareTestDir(t) </s> remove "os"
</s> add </s> remove dir := prepareTestDir()
defer func() { _ = os.RemoveAll(dir) }()
</s> add dir := prepareTestDir(t) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/authglinet_test.go |
dir := prepareTestDir(t) | <mask> "github.com/stretchr/testify/assert"
<mask> )
<mask>
<mask> func TestAuthGL(t *testing.T) {
<mask> dir := prepareTestDir()
<mask> defer func() { _ = os.RemoveAll(dir) }()
<mask>
<mask> GLMode = true
<mask> glFilePrefix = dir + "/gl_token_"
<mask>
<mask> tval := uint32(1)
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove tval := uint32(1)
data := make([]byte, 4)
</s> add putFunc := binary.BigEndian.PutUint32 </s> remove dir := prepareTestDir()
defer func() { _ = os.RemoveAll(dir) }()
</s> add dir := prepareTestDir(t) </s> remove l := testStartFilterListener()
defer func() { _ = l.Close() }()
dir := prepareTestDir()
defer func() { _ = os.RemoveAll(dir) }()
Context = homeContext{}
Context.workDir = dir
Context.client = &http.Client{
Timeout: 5 * time.Second,
</s> add l := testStartFilterListener(t)
dir := prepareTestDir(t)
Context = homeContext{
workDir: dir,
client: &http.Client{
Timeout: 5 * time.Second,
}, </s> remove dir := prepareTestDir()
defer func() { _ = os.RemoveAll(dir) }()
</s> add dir := prepareTestDir(t) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/authglinet_test.go |
t.Cleanup(func() {
GLMode = false
}) | <mask> dir := prepareTestDir(t)
<mask>
<mask> GLMode = true
<mask> glFilePrefix = dir + "/gl_token_"
<mask>
<mask> putFunc := binary.BigEndian.PutUint32
<mask> if archIsLittleEndian() {
<mask> putFunc = binary.LittleEndian.PutUint32
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove tval := uint32(1)
data := make([]byte, 4)
</s> add putFunc := binary.BigEndian.PutUint32 </s> remove dir := prepareTestDir()
defer func() { _ = os.RemoveAll(dir) }()
</s> add dir := prepareTestDir(t) </s> remove binary.LittleEndian.PutUint32(data, tval)
} else {
binary.BigEndian.PutUint32(data, tval)
</s> add putFunc = binary.LittleEndian.PutUint32 </s> remove dir := prepareTestDir()
defer func() { _ = os.RemoveAll(dir) }()
</s> add dir := prepareTestDir(t) </s> remove dir := prepareTestDir()
t.Cleanup(func() { _ = os.RemoveAll(dir) })
</s> add dir := prepareTestDir(t) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/authglinet_test.go |
putFunc := binary.BigEndian.PutUint32 | <mask>
<mask> GLMode = true
<mask> glFilePrefix = dir + "/gl_token_"
<mask>
<mask> tval := uint32(1)
<mask> data := make([]byte, 4)
<mask> if archIsLittleEndian() {
<mask> binary.LittleEndian.PutUint32(data, tval)
<mask> } else {
<mask> binary.BigEndian.PutUint32(data, tval)
<mask> }
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove binary.LittleEndian.PutUint32(data, tval)
} else {
binary.BigEndian.PutUint32(data, tval)
</s> add putFunc = binary.LittleEndian.PutUint32 </s> remove assert.Nil(t, ioutil.WriteFile(glFilePrefix+"test", data, 0o644))
</s> add data := make([]byte, 4)
putFunc(data, 1)
require.Nil(t, ioutil.WriteFile(glFilePrefix+"test", data, 0o644)) </s> remove tval = uint32(time.Now().UTC().Unix() + 60)
</s> add </s> remove if archIsLittleEndian() {
binary.LittleEndian.PutUint32(data, tval)
} else {
binary.BigEndian.PutUint32(data, tval)
}
assert.Nil(t, ioutil.WriteFile(glFilePrefix+"test", data, 0o644))
</s> add putFunc(data, uint32(time.Now().UTC().Unix()+60))
require.Nil(t, ioutil.WriteFile(glFilePrefix+"test", data, 0o644)) </s> remove dir := prepareTestDir()
defer func() { _ = os.RemoveAll(dir) }()
</s> add dir := prepareTestDir(t) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/authglinet_test.go |
putFunc = binary.LittleEndian.PutUint32 | <mask>
<mask> tval := uint32(1)
<mask> data := make([]byte, 4)
<mask> if archIsLittleEndian() {
<mask> binary.LittleEndian.PutUint32(data, tval)
<mask> } else {
<mask> binary.BigEndian.PutUint32(data, tval)
<mask> }
<mask> assert.Nil(t, ioutil.WriteFile(glFilePrefix+"test", data, 0o644))
<mask> assert.False(t, glCheckToken("test"))
<mask>
<mask> tval = uint32(time.Now().UTC().Unix() + 60)
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.Nil(t, ioutil.WriteFile(glFilePrefix+"test", data, 0o644))
</s> add data := make([]byte, 4)
putFunc(data, 1)
require.Nil(t, ioutil.WriteFile(glFilePrefix+"test", data, 0o644)) </s> remove tval = uint32(time.Now().UTC().Unix() + 60)
</s> add </s> remove if archIsLittleEndian() {
binary.LittleEndian.PutUint32(data, tval)
} else {
binary.BigEndian.PutUint32(data, tval)
}
assert.Nil(t, ioutil.WriteFile(glFilePrefix+"test", data, 0o644))
</s> add putFunc(data, uint32(time.Now().UTC().Unix()+60))
require.Nil(t, ioutil.WriteFile(glFilePrefix+"test", data, 0o644)) </s> remove tval := uint32(1)
data := make([]byte, 4)
</s> add putFunc := binary.BigEndian.PutUint32 </s> remove dir := prepareTestDir()
defer func() { _ = os.RemoveAll(dir) }()
</s> add dir := prepareTestDir(t) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/authglinet_test.go |
data := make([]byte, 4)
putFunc(data, 1)
require.Nil(t, ioutil.WriteFile(glFilePrefix+"test", data, 0o644)) | <mask> binary.LittleEndian.PutUint32(data, tval)
<mask> } else {
<mask> binary.BigEndian.PutUint32(data, tval)
<mask> }
<mask> assert.Nil(t, ioutil.WriteFile(glFilePrefix+"test", data, 0o644))
<mask> assert.False(t, glCheckToken("test"))
<mask>
<mask> tval = uint32(time.Now().UTC().Unix() + 60)
<mask> data = make([]byte, 4)
<mask> if archIsLittleEndian() {
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove tval = uint32(time.Now().UTC().Unix() + 60)
</s> add </s> remove binary.LittleEndian.PutUint32(data, tval)
} else {
binary.BigEndian.PutUint32(data, tval)
</s> add putFunc = binary.LittleEndian.PutUint32 </s> remove if archIsLittleEndian() {
binary.LittleEndian.PutUint32(data, tval)
} else {
binary.BigEndian.PutUint32(data, tval)
}
assert.Nil(t, ioutil.WriteFile(glFilePrefix+"test", data, 0o644))
</s> add putFunc(data, uint32(time.Now().UTC().Unix()+60))
require.Nil(t, ioutil.WriteFile(glFilePrefix+"test", data, 0o644)) </s> remove tval := uint32(1)
data := make([]byte, 4)
</s> add putFunc := binary.BigEndian.PutUint32 </s> remove GLMode = false
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/authglinet_test.go |
<mask> }
<mask> assert.Nil(t, ioutil.WriteFile(glFilePrefix+"test", data, 0o644))
<mask> assert.False(t, glCheckToken("test"))
<mask>
<mask> tval = uint32(time.Now().UTC().Unix() + 60)
<mask> data = make([]byte, 4)
<mask> if archIsLittleEndian() {
<mask> binary.LittleEndian.PutUint32(data, tval)
<mask> } else {
<mask> binary.BigEndian.PutUint32(data, tval)
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.Nil(t, ioutil.WriteFile(glFilePrefix+"test", data, 0o644))
</s> add data := make([]byte, 4)
putFunc(data, 1)
require.Nil(t, ioutil.WriteFile(glFilePrefix+"test", data, 0o644)) </s> remove binary.LittleEndian.PutUint32(data, tval)
} else {
binary.BigEndian.PutUint32(data, tval)
</s> add putFunc = binary.LittleEndian.PutUint32 </s> remove if archIsLittleEndian() {
binary.LittleEndian.PutUint32(data, tval)
} else {
binary.BigEndian.PutUint32(data, tval)
}
assert.Nil(t, ioutil.WriteFile(glFilePrefix+"test", data, 0o644))
</s> add putFunc(data, uint32(time.Now().UTC().Unix()+60))
require.Nil(t, ioutil.WriteFile(glFilePrefix+"test", data, 0o644)) </s> remove tval := uint32(1)
data := make([]byte, 4)
</s> add putFunc := binary.BigEndian.PutUint32 </s> remove GLMode = false
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/authglinet_test.go | |
putFunc(data, uint32(time.Now().UTC().Unix()+60))
require.Nil(t, ioutil.WriteFile(glFilePrefix+"test", data, 0o644)) | <mask> assert.False(t, glCheckToken("test"))
<mask>
<mask> tval = uint32(time.Now().UTC().Unix() + 60)
<mask> data = make([]byte, 4)
<mask> if archIsLittleEndian() {
<mask> binary.LittleEndian.PutUint32(data, tval)
<mask> } else {
<mask> binary.BigEndian.PutUint32(data, tval)
<mask> }
<mask> assert.Nil(t, ioutil.WriteFile(glFilePrefix+"test", data, 0o644))
<mask> r, _ := http.NewRequest(http.MethodGet, "http://localhost/", nil)
<mask> r.AddCookie(&http.Cookie{Name: glCookieName, Value: "test"})
<mask> assert.True(t, glProcessCookie(r))
<mask> GLMode = false
<mask> }
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.Nil(t, ioutil.WriteFile(glFilePrefix+"test", data, 0o644))
</s> add data := make([]byte, 4)
putFunc(data, 1)
require.Nil(t, ioutil.WriteFile(glFilePrefix+"test", data, 0o644)) </s> remove tval = uint32(time.Now().UTC().Unix() + 60)
</s> add </s> remove binary.LittleEndian.PutUint32(data, tval)
} else {
binary.BigEndian.PutUint32(data, tval)
</s> add putFunc = binary.LittleEndian.PutUint32 </s> remove GLMode = false
</s> add </s> remove tval := uint32(1)
data := make([]byte, 4)
</s> add putFunc := binary.BigEndian.PutUint32 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/authglinet_test.go |
<mask> assert.Nil(t, ioutil.WriteFile(glFilePrefix+"test", data, 0o644))
<mask> r, _ := http.NewRequest(http.MethodGet, "http://localhost/", nil)
<mask> r.AddCookie(&http.Cookie{Name: glCookieName, Value: "test"})
<mask> assert.True(t, glProcessCookie(r))
<mask> GLMode = false
<mask> }
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove if archIsLittleEndian() {
binary.LittleEndian.PutUint32(data, tval)
} else {
binary.BigEndian.PutUint32(data, tval)
}
assert.Nil(t, ioutil.WriteFile(glFilePrefix+"test", data, 0o644))
</s> add putFunc(data, uint32(time.Now().UTC().Unix()+60))
require.Nil(t, ioutil.WriteFile(glFilePrefix+"test", data, 0o644)) </s> remove assert.Nil(t, ioutil.WriteFile(glFilePrefix+"test", data, 0o644))
</s> add data := make([]byte, 4)
putFunc(data, 1)
require.Nil(t, ioutil.WriteFile(glFilePrefix+"test", data, 0o644)) </s> remove binary.LittleEndian.PutUint32(data, tval)
} else {
binary.BigEndian.PutUint32(data, tval)
</s> add putFunc = binary.LittleEndian.PutUint32 </s> remove tval = uint32(time.Now().UTC().Unix() + 60)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/authglinet_test.go | |
"github.com/stretchr/testify/require" | <mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dhcpd"
<mask>
<mask> "github.com/stretchr/testify/assert"
<mask> )
<mask>
<mask> func TestClients(t *testing.T) {
<mask> clients := clientsContainer{}
<mask> clients.testing = true
<mask>
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove clients := clientsContainer{}
clients.testing = true
</s> add clients := clientsContainer{
testing: true,
} </s> remove var c *Client
clients := clientsContainer{}
clients.testing = true
</s> add clients := clientsContainer{
testing: true,
} </s> remove func TestClientsAddExisting(t *testing.T) {
var c *Client
clients := clientsContainer{}
clients.testing = true
clients.Init(nil, nil, nil)
</s> add t.Run("can't_set_manually-added", func(t *testing.T) {
ok, err := clients.Add(&Client{
IDs: []string{"1.1.1.2"},
Name: "client1",
})
require.Nil(t, err)
assert.True(t, ok) </s> remove // some test variables
mac, _ := net.ParseMAC("aa:aa:aa:aa:aa:aa")
testIP := "1.2.3.4"
</s> add clients.SetWhoisInfo("1.1.1.2", whois)
require.Nil(t, clients.ipHost["1.1.1.2"])
assert.True(t, clients.Del("client1"))
})
} </s> remove // Check that we cannot set whois info on a manually-added client
c = &Client{
IDs: []string{"1.1.1.2"},
Name: "client1",
}
_, _ = clients.Add(c)
clients.SetWhoisInfo("1.1.1.2", whois)
assert.Nil(t, clients.ipHost["1.1.1.2"])
_ = clients.Del("client1")
}
</s> add require.Len(t, h.WhoisInfo, 2)
require.Len(t, h.WhoisInfo[0], 2)
assert.Equal(t, "orgname-val", h.WhoisInfo[0][1])
}) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/clients_test.go |
require.Nil(t, err) | <mask> }
<mask>
<mask> ok, err := clients.Add(c)
<mask> assert.True(t, ok)
<mask>
<mask> c = &Client{
<mask> IDs: []string{"2.2.2.2"},
<mask> Name: "client2",
<mask> }
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.Nil(t, err)
</s> add </s> remove c := &Client{
</s> add ok, err := clients.Add(&Client{ </s> remove assert.Nil(t, err)
</s> add </s> remove }
ok, err := clients.Add(c)
</s> add })
require.NotNil(t, err) </s> remove // add a new client with the same IP as for a client with MAC
c = &Client{
IDs: []string{testIP},
Name: "client2",
}
ok, err = clients.Add(c)
assert.True(t, ok)
assert.Nil(t, err)
</s> add t.Run("complicated", func(t *testing.T) {
testIP := net.IP{1, 2, 3, 4} | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/clients_test.go |
<mask> }
<mask>
<mask> ok, err := clients.Add(c)
<mask> assert.True(t, ok)
<mask> assert.Nil(t, err)
<mask>
<mask> c = &Client{
<mask> IDs: []string{"2.2.2.2"},
<mask> Name: "client2",
<mask> }
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove c := &Client{
</s> add ok, err := clients.Add(&Client{ </s> remove assert.Nil(t, err)
</s> add </s> remove }
ok, err := clients.Add(c)
</s> add })
require.NotNil(t, err) </s> remove // add a new client with the same IP as for a client with MAC
c = &Client{
IDs: []string{testIP},
Name: "client2",
}
ok, err = clients.Add(c)
assert.True(t, ok)
assert.Nil(t, err)
</s> add t.Run("complicated", func(t *testing.T) {
testIP := net.IP{1, 2, 3, 4} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/clients_test.go | |
require.Nil(t, err) | <mask>
<mask> ok, err = clients.Add(c)
<mask> assert.True(t, ok)
<mask>
<mask> c, ok = clients.Find("1.1.1.1")
<mask> require.True(t, ok)
<mask> assert.Equal(t, "client1", c.Name)
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.Nil(t, err)
</s> add </s> remove assert.True(t, ok)
</s> add require.True(t, ok) </s> remove assert.True(t, ok)
</s> add require.True(t, ok) </s> remove assert.True(t, ok)
</s> add require.True(t, ok) </s> remove assert.True(t, ok)
</s> add require.True(t, ok) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/clients_test.go |
<mask> }
<mask>
<mask> ok, err = clients.Add(c)
<mask> assert.True(t, ok)
<mask> assert.Nil(t, err)
<mask>
<mask> c, ok = clients.Find("1.1.1.1")
<mask> assert.True(t, ok)
<mask> assert.Equal(t, "client1", c.Name)
<mask>
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.True(t, ok)
</s> add require.True(t, ok) </s> remove assert.True(t, ok)
</s> add require.True(t, ok) </s> remove assert.True(t, ok)
</s> add require.True(t, ok) </s> remove }
err = clients.Update("client1", c)
assert.Nil(t, err)
</s> add })
require.Nil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/clients_test.go | |
require.True(t, ok) | <mask> assert.True(t, ok)
<mask> assert.Nil(t, err)
<mask>
<mask> c, ok = clients.Find("1.1.1.1")
<mask> assert.True(t, ok)
<mask> assert.Equal(t, "client1", c.Name)
<mask>
<mask> c, ok = clients.Find("1:2:3::4")
<mask> assert.True(t, ok)
<mask> assert.Equal(t, "client1", c.Name)
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.True(t, ok)
</s> add require.True(t, ok) </s> remove assert.Nil(t, err)
</s> add </s> remove assert.True(t, ok)
</s> add require.True(t, ok) </s> remove assert.True(t, ok)
</s> add require.True(t, ok) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/clients_test.go |
require.True(t, ok) | <mask> assert.True(t, ok)
<mask> assert.Equal(t, "client1", c.Name)
<mask>
<mask> c, ok = clients.Find("1:2:3::4")
<mask> assert.True(t, ok)
<mask> assert.Equal(t, "client1", c.Name)
<mask>
<mask> c, ok = clients.Find("2.2.2.2")
<mask> assert.True(t, ok)
<mask> assert.Equal(t, "client2", c.Name)
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.True(t, ok)
</s> add require.True(t, ok) </s> remove assert.True(t, ok)
</s> add require.True(t, ok) </s> remove assert.Nil(t, err)
</s> add </s> remove assert.True(t, !clients.Exists("1.2.3.4", ClientSourceHostsFile))
</s> add assert.False(t, clients.Exists("1.2.3.4", ClientSourceHostsFile)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/clients_test.go |
require.True(t, ok) | <mask> assert.True(t, ok)
<mask> assert.Equal(t, "client1", c.Name)
<mask>
<mask> c, ok = clients.Find("2.2.2.2")
<mask> assert.True(t, ok)
<mask> assert.Equal(t, "client2", c.Name)
<mask>
<mask> assert.True(t, !clients.Exists("1.2.3.4", ClientSourceHostsFile))
<mask> assert.True(t, clients.Exists("1.1.1.1", ClientSourceHostsFile))
<mask> assert.True(t, clients.Exists("2.2.2.2", ClientSourceHostsFile))
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.True(t, !clients.Exists("1.2.3.4", ClientSourceHostsFile))
</s> add assert.False(t, clients.Exists("1.2.3.4", ClientSourceHostsFile)) </s> remove assert.True(t, ok)
</s> add require.True(t, ok) </s> remove assert.True(t, ok)
</s> add require.True(t, ok) </s> remove assert.Nil(t, err)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/clients_test.go |
assert.False(t, clients.Exists("1.2.3.4", ClientSourceHostsFile)) | <mask> c, ok = clients.Find("2.2.2.2")
<mask> assert.True(t, ok)
<mask> assert.Equal(t, "client2", c.Name)
<mask>
<mask> assert.True(t, !clients.Exists("1.2.3.4", ClientSourceHostsFile))
<mask> assert.True(t, clients.Exists("1.1.1.1", ClientSourceHostsFile))
<mask> assert.True(t, clients.Exists("2.2.2.2", ClientSourceHostsFile))
<mask> })
<mask>
<mask> t.Run("add_fail_name", func(t *testing.T) {
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.True(t, ok)
</s> add require.True(t, ok) </s> remove assert.True(t, ok)
</s> add require.True(t, ok) </s> remove assert.Nil(t, err)
</s> add </s> remove c := &Client{
</s> add ok, err := clients.Add(&Client{ </s> remove assert.True(t, !clients.Exists("1.1.1.1", ClientSourceHostsFile))
</s> add assert.False(t, clients.Exists("1.1.1.1", ClientSourceHostsFile)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/clients_test.go |
ok, err := clients.Add(&Client{ | <mask> assert.True(t, clients.Exists("2.2.2.2", ClientSourceHostsFile))
<mask> })
<mask>
<mask> t.Run("add_fail_name", func(t *testing.T) {
<mask> c := &Client{
<mask> IDs: []string{"1.2.3.5"},
<mask> Name: "client1",
<mask> }
<mask>
<mask> ok, err := clients.Add(c)
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove }
ok, err := clients.Add(c)
</s> add })
require.Nil(t, err) </s> remove }
err := clients.Update("client1", c)
assert.Nil(t, err)
</s> add })
require.Nil(t, err) </s> remove c := &Client{
</s> add ok, err := clients.Add(&Client{ </s> remove }
err := clients.Update("client1", c)
</s> add }) </s> remove }
ok, err := clients.Add(c)
</s> add })
require.NotNil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/clients_test.go |
})
require.Nil(t, err) | <mask> t.Run("add_fail_name", func(t *testing.T) {
<mask> c := &Client{
<mask> IDs: []string{"1.2.3.5"},
<mask> Name: "client1",
<mask> }
<mask>
<mask> ok, err := clients.Add(c)
<mask> assert.False(t, ok)
<mask> assert.Nil(t, err)
<mask> })
<mask>
<mask> t.Run("add_fail_ip", func(t *testing.T) {
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove c := &Client{
</s> add ok, err := clients.Add(&Client{ </s> remove }
ok, err := clients.Add(c)
</s> add })
require.NotNil(t, err) </s> remove assert.Nil(t, err)
</s> add </s> remove c := &Client{
</s> add ok, err := clients.Add(&Client{ </s> remove assert.NotNil(t, err)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/clients_test.go |
<mask> }
<mask>
<mask> ok, err := clients.Add(c)
<mask> assert.False(t, ok)
<mask> assert.Nil(t, err)
<mask> })
<mask>
<mask> t.Run("add_fail_ip", func(t *testing.T) {
<mask> c := &Client{
<mask> IDs: []string{"2.2.2.2"},
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove }
ok, err := clients.Add(c)
</s> add })
require.NotNil(t, err) </s> remove c := &Client{
</s> add ok, err := clients.Add(&Client{ </s> remove }
ok, err := clients.Add(c)
</s> add })
require.Nil(t, err) </s> remove assert.NotNil(t, err)
</s> add </s> remove assert.Nil(t, err)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/clients_test.go | |
ok, err := clients.Add(&Client{ | <mask> assert.Nil(t, err)
<mask> })
<mask>
<mask> t.Run("add_fail_ip", func(t *testing.T) {
<mask> c := &Client{
<mask> IDs: []string{"2.2.2.2"},
<mask> Name: "client3",
<mask> }
<mask>
<mask> ok, err := clients.Add(c)
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove }
ok, err := clients.Add(c)
</s> add })
require.NotNil(t, err) </s> remove assert.Nil(t, err)
</s> add </s> remove }
ok, err := clients.Add(c)
</s> add })
require.Nil(t, err) </s> remove assert.Nil(t, err)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/clients_test.go |
})
require.NotNil(t, err) | <mask> t.Run("add_fail_ip", func(t *testing.T) {
<mask> c := &Client{
<mask> IDs: []string{"2.2.2.2"},
<mask> Name: "client3",
<mask> }
<mask>
<mask> ok, err := clients.Add(c)
<mask> assert.False(t, ok)
<mask> assert.NotNil(t, err)
<mask> })
<mask>
<mask> t.Run("update_fail_name", func(t *testing.T) {
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove c := &Client{
</s> add ok, err := clients.Add(&Client{ </s> remove assert.Nil(t, err)
</s> add </s> remove assert.NotNil(t, err)
</s> add </s> remove }
ok, err := clients.Add(c)
</s> add })
require.Nil(t, err) </s> remove c := &Client{
</s> add err := clients.Update("client3", &Client{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/clients_test.go |
<mask> }
<mask>
<mask> ok, err := clients.Add(c)
<mask> assert.False(t, ok)
<mask> assert.NotNil(t, err)
<mask> })
<mask>
<mask> t.Run("update_fail_name", func(t *testing.T) {
<mask> c := &Client{
<mask> IDs: []string{"1.2.3.0"},
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove }
ok, err := clients.Add(c)
</s> add })
require.NotNil(t, err) </s> remove c := &Client{
</s> add err := clients.Update("client3", &Client{ </s> remove }
</s> add })
require.NotNil(t, err) </s> remove assert.Nil(t, err)
</s> add </s> remove }
ok, err := clients.Add(c)
</s> add })
require.Nil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/clients_test.go | |
err := clients.Update("client3", &Client{ | <mask> assert.NotNil(t, err)
<mask> })
<mask>
<mask> t.Run("update_fail_name", func(t *testing.T) {
<mask> c := &Client{
<mask> IDs: []string{"1.2.3.0"},
<mask> Name: "client3",
<mask> }
<mask>
<mask> err := clients.Update("client3", c)
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove }
</s> add })
require.NotNil(t, err) </s> remove err := clients.Update("client3", c)
assert.NotNil(t, err)
c = &Client{
</s> add err = clients.Update("client3", &Client{ </s> remove }
err = clients.Update("client3", c)
</s> add }) </s> remove }
ok, err := clients.Add(c)
</s> add })
require.NotNil(t, err) </s> remove assert.NotNil(t, err)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/clients_test.go |
})
require.NotNil(t, err) | <mask> t.Run("update_fail_name", func(t *testing.T) {
<mask> c := &Client{
<mask> IDs: []string{"1.2.3.0"},
<mask> Name: "client3",
<mask> }
<mask>
<mask> err := clients.Update("client3", c)
<mask> assert.NotNil(t, err)
<mask>
<mask> c = &Client{
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove c := &Client{
</s> add err := clients.Update("client3", &Client{ </s> remove err := clients.Update("client3", c)
assert.NotNil(t, err)
c = &Client{
</s> add err = clients.Update("client3", &Client{ </s> remove }
err = clients.Update("client3", c)
</s> add }) </s> remove assert.NotNil(t, err)
</s> add </s> remove }
ok, err := clients.Add(c)
</s> add })
require.NotNil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/clients_test.go |
err = clients.Update("client3", &Client{ | <mask> IDs: []string{"1.2.3.0"},
<mask> Name: "client3",
<mask> }
<mask>
<mask> err := clients.Update("client3", c)
<mask> assert.NotNil(t, err)
<mask>
<mask> c = &Client{
<mask> IDs: []string{"1.2.3.0"},
<mask> Name: "client2",
<mask> }
<mask>
<mask> err = clients.Update("client3", c)
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove c := &Client{
</s> add err := clients.Update("client3", &Client{ </s> remove }
err = clients.Update("client3", c)
</s> add }) </s> remove }
</s> add })
require.NotNil(t, err) </s> remove c := &Client{
</s> add err := clients.Update("client1", &Client{ </s> remove c := &Client{
</s> add err := clients.Update("client1", &Client{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/clients_test.go |
}) | <mask>
<mask> c = &Client{
<mask> IDs: []string{"1.2.3.0"},
<mask> Name: "client2",
<mask> }
<mask>
<mask> err = clients.Update("client3", c)
<mask> assert.NotNil(t, err)
<mask> })
<mask>
<mask> t.Run("update_fail_ip", func(t *testing.T) {
<mask> c := &Client{
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove err := clients.Update("client3", c)
assert.NotNil(t, err)
c = &Client{
</s> add err = clients.Update("client3", &Client{ </s> remove }
</s> add })
require.NotNil(t, err) </s> remove c := &Client{
</s> add err := clients.Update("client3", &Client{ </s> remove }
err := clients.Update("client1", c)
</s> add }) </s> remove c := &Client{
</s> add err := clients.Update("client1", &Client{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/clients_test.go |
err := clients.Update("client1", &Client{ | <mask> assert.NotNil(t, err)
<mask> })
<mask>
<mask> t.Run("update_fail_ip", func(t *testing.T) {
<mask> c := &Client{
<mask> IDs: []string{"2.2.2.2"},
<mask> Name: "client1",
<mask> }
<mask>
<mask> err := clients.Update("client1", c)
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove }
err := clients.Update("client1", c)
</s> add }) </s> remove c := &Client{
</s> add err := clients.Update("client1", &Client{ </s> remove }
err = clients.Update("client3", c)
</s> add }) </s> remove }
err := clients.Update("client1", c)
assert.Nil(t, err)
</s> add })
require.Nil(t, err) </s> remove }
</s> add })
require.NotNil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/clients_test.go |
}) | <mask> t.Run("update_fail_ip", func(t *testing.T) {
<mask> c := &Client{
<mask> IDs: []string{"2.2.2.2"},
<mask> Name: "client1",
<mask> }
<mask>
<mask> err := clients.Update("client1", c)
<mask> assert.NotNil(t, err)
<mask> })
<mask>
<mask> t.Run("update_success", func(t *testing.T) {
<mask> c := &Client{
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove c := &Client{
</s> add err := clients.Update("client1", &Client{ </s> remove c := &Client{
</s> add err := clients.Update("client1", &Client{ </s> remove }
err := clients.Update("client1", c)
assert.Nil(t, err)
</s> add })
require.Nil(t, err) </s> remove }
err = clients.Update("client3", c)
</s> add }) </s> remove }
</s> add })
require.NotNil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/clients_test.go |
err := clients.Update("client1", &Client{ | <mask> assert.NotNil(t, err)
<mask> })
<mask>
<mask> t.Run("update_success", func(t *testing.T) {
<mask> c := &Client{
<mask> IDs: []string{"1.1.1.2"},
<mask> Name: "client1",
<mask> }
<mask>
<mask> err := clients.Update("client1", c)
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove }
err := clients.Update("client1", c)
</s> add }) </s> remove }
err := clients.Update("client1", c)
assert.Nil(t, err)
</s> add })
require.Nil(t, err) </s> remove c := &Client{
</s> add err := clients.Update("client1", &Client{ </s> remove }
</s> add })
require.NotNil(t, err) </s> remove c := &Client{
</s> add err := clients.Update("client3", &Client{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/clients_test.go |
})
require.Nil(t, err) | <mask> t.Run("update_success", func(t *testing.T) {
<mask> c := &Client{
<mask> IDs: []string{"1.1.1.2"},
<mask> Name: "client1",
<mask> }
<mask>
<mask> err := clients.Update("client1", c)
<mask> assert.Nil(t, err)
<mask>
<mask> assert.True(t, !clients.Exists("1.1.1.1", ClientSourceHostsFile))
<mask> assert.True(t, clients.Exists("1.1.1.2", ClientSourceHostsFile))
<mask>
<mask> c = &Client{
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.True(t, !clients.Exists("1.1.1.1", ClientSourceHostsFile))
</s> add assert.False(t, clients.Exists("1.1.1.1", ClientSourceHostsFile)) </s> remove c = &Client{
</s> add err = clients.Update("client1", &Client{ </s> remove c := &Client{
</s> add err := clients.Update("client1", &Client{ </s> remove }
err := clients.Update("client1", c)
</s> add }) </s> remove c := &Client{
</s> add err := clients.Update("client1", &Client{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/clients_test.go |
assert.False(t, clients.Exists("1.1.1.1", ClientSourceHostsFile)) | <mask>
<mask> err := clients.Update("client1", c)
<mask> assert.Nil(t, err)
<mask>
<mask> assert.True(t, !clients.Exists("1.1.1.1", ClientSourceHostsFile))
<mask> assert.True(t, clients.Exists("1.1.1.2", ClientSourceHostsFile))
<mask>
<mask> c = &Client{
<mask> IDs: []string{"1.1.1.2"},
<mask> Name: "client1-renamed",
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove c = &Client{
</s> add err = clients.Update("client1", &Client{ </s> remove }
err := clients.Update("client1", c)
assert.Nil(t, err)
</s> add })
require.Nil(t, err) </s> remove }
err = clients.Update("client1", c)
assert.Nil(t, err)
</s> add })
require.Nil(t, err) </s> remove c := &Client{
</s> add err := clients.Update("client1", &Client{ </s> remove c := &Client{
</s> add err := clients.Update("client1", &Client{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/clients_test.go |
err = clients.Update("client1", &Client{ | <mask>
<mask> assert.True(t, !clients.Exists("1.1.1.1", ClientSourceHostsFile))
<mask> assert.True(t, clients.Exists("1.1.1.2", ClientSourceHostsFile))
<mask>
<mask> c = &Client{
<mask> IDs: []string{"1.1.1.2"},
<mask> Name: "client1-renamed",
<mask> UseOwnSettings: true,
<mask> }
<mask>
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.True(t, !clients.Exists("1.1.1.1", ClientSourceHostsFile))
</s> add assert.False(t, clients.Exists("1.1.1.1", ClientSourceHostsFile)) </s> remove }
err := clients.Update("client1", c)
assert.Nil(t, err)
</s> add })
require.Nil(t, err) </s> remove }
err = clients.Update("client1", c)
assert.Nil(t, err)
</s> add })
require.Nil(t, err) </s> remove c := &Client{
</s> add ok, err := clients.Add(&Client{ </s> remove c := &Client{
</s> add err := clients.Update("client1", &Client{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/clients_test.go |
})
require.Nil(t, err) | <mask> c = &Client{
<mask> IDs: []string{"1.1.1.2"},
<mask> Name: "client1-renamed",
<mask> UseOwnSettings: true,
<mask> }
<mask>
<mask> err = clients.Update("client1", c)
<mask> assert.Nil(t, err)
<mask>
<mask> c, ok := clients.Find("1.1.1.2")
<mask> assert.True(t, ok)
<mask> assert.Equal(t, "client1-renamed", c.Name)
<mask> assert.True(t, c.UseOwnSettings)
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove c = &Client{
</s> add err = clients.Update("client1", &Client{ </s> remove assert.True(t, ok)
</s> add require.True(t, ok) </s> remove assert.True(t, !clients.Exists("1.1.1.1", ClientSourceHostsFile))
</s> add assert.False(t, clients.Exists("1.1.1.1", ClientSourceHostsFile)) </s> remove }
err := clients.Update("client1", c)
assert.Nil(t, err)
</s> add })
require.Nil(t, err) </s> remove assert.Nil(t, clients.list["client1"])
if assert.Len(t, c.IDs, 1) {
assert.Equal(t, "1.1.1.2", c.IDs[0])
}
</s> add nilCli, ok := clients.list["client1"]
require.False(t, ok)
assert.Nil(t, nilCli)
require.Len(t, c.IDs, 1)
assert.Equal(t, "1.1.1.2", c.IDs[0]) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/clients_test.go |
require.True(t, ok) | <mask> err = clients.Update("client1", c)
<mask> assert.Nil(t, err)
<mask>
<mask> c, ok := clients.Find("1.1.1.2")
<mask> assert.True(t, ok)
<mask> assert.Equal(t, "client1-renamed", c.Name)
<mask> assert.True(t, c.UseOwnSettings)
<mask> assert.Nil(t, clients.list["client1"])
<mask> if assert.Len(t, c.IDs, 1) {
<mask> assert.Equal(t, "1.1.1.2", c.IDs[0])
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.Nil(t, clients.list["client1"])
if assert.Len(t, c.IDs, 1) {
assert.Equal(t, "1.1.1.2", c.IDs[0])
}
</s> add nilCli, ok := clients.list["client1"]
require.False(t, ok)
assert.Nil(t, nilCli)
require.Len(t, c.IDs, 1)
assert.Equal(t, "1.1.1.2", c.IDs[0]) </s> remove }
err = clients.Update("client1", c)
assert.Nil(t, err)
</s> add })
require.Nil(t, err) </s> remove assert.True(t, ok)
</s> add require.True(t, ok) </s> remove assert.True(t, ok)
</s> add require.True(t, ok) </s> remove assert.Nil(t, err)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/clients_test.go |
nilCli, ok := clients.list["client1"]
require.False(t, ok)
assert.Nil(t, nilCli)
require.Len(t, c.IDs, 1)
assert.Equal(t, "1.1.1.2", c.IDs[0]) | <mask> c, ok := clients.Find("1.1.1.2")
<mask> assert.True(t, ok)
<mask> assert.Equal(t, "client1-renamed", c.Name)
<mask> assert.True(t, c.UseOwnSettings)
<mask> assert.Nil(t, clients.list["client1"])
<mask> if assert.Len(t, c.IDs, 1) {
<mask> assert.Equal(t, "1.1.1.2", c.IDs[0])
<mask> }
<mask> })
<mask>
<mask> t.Run("del_success", func(t *testing.T) {
<mask> ok := clients.Del("client1-renamed")
<mask> assert.True(t, ok)
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.True(t, ok)
</s> add require.True(t, ok) </s> remove }
err = clients.Update("client1", c)
assert.Nil(t, err)
</s> add })
require.Nil(t, err) </s> remove assert.True(t, ok)
</s> add require.True(t, ok) </s> remove assert.True(t, ok)
</s> add require.True(t, ok) </s> remove assert.True(t, ok)
</s> add require.True(t, ok) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/clients_test.go |
require.True(t, ok) | <mask> })
<mask>
<mask> t.Run("del_success", func(t *testing.T) {
<mask> ok := clients.Del("client1-renamed")
<mask> assert.True(t, ok)
<mask> assert.False(t, clients.Exists("1.1.1.2", ClientSourceHostsFile))
<mask> })
<mask>
<mask> t.Run("del_fail", func(t *testing.T) {
<mask> ok := clients.Del("client3")
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.Nil(t, clients.list["client1"])
if assert.Len(t, c.IDs, 1) {
assert.Equal(t, "1.1.1.2", c.IDs[0])
}
</s> add nilCli, ok := clients.list["client1"]
require.False(t, ok)
assert.Nil(t, nilCli)
require.Len(t, c.IDs, 1)
assert.Equal(t, "1.1.1.2", c.IDs[0]) </s> remove assert.True(t, !clients.Exists("1.2.3.4", ClientSourceHostsFile))
</s> add assert.False(t, clients.Exists("1.2.3.4", ClientSourceHostsFile)) </s> remove }
err := clients.Update("client1", c)
assert.Nil(t, err)
</s> add })
require.Nil(t, err) </s> remove assert.True(t, !clients.Exists("1.1.1.1", ClientSourceHostsFile))
</s> add assert.False(t, clients.Exists("1.1.1.1", ClientSourceHostsFile)) </s> remove if assert.Len(t, d.Res.Answer, 1) {
ans, ok := d.Res.Answer[0].(*dns.MX)
if assert.True(t, ok) {
assert.Equal(t, mx.Exchange, ans.Mx)
assert.Equal(t, mx.Preference, ans.Preference)
}
}
</s> add require.Len(t, d.Res.Answer, 1)
ans, ok := d.Res.Answer[0].(*dns.MX)
require.True(t, ok)
assert.Equal(t, mx.Exchange, ans.Mx)
assert.Equal(t, mx.Preference, ans.Preference) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/clients_test.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.