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.Nil(t, err) | <mask>
<mask> t.Run("addhost_success", func(t *testing.T) {
<mask> ok, err := clients.AddHost("1.1.1.1", "host", ClientSourceARP)
<mask> assert.True(t, ok)
<mask>
<mask> ok, err = clients.AddHost("1.1.1.1", "host2", ClientSourceARP)
<mask> require.Nil(t, err)
<mask> assert.True(t, ok)
<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 assert.Nil(t, err)
</s> add </s> remove assert.Nil(t, err)
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/clients_test.go |
<mask>
<mask> t.Run("addhost_success", func(t *testing.T) {
<mask> ok, err := clients.AddHost("1.1.1.1", "host", ClientSourceARP)
<mask> assert.True(t, ok)
<mask> assert.Nil(t, err)
<mask>
<mask> ok, err = clients.AddHost("1.1.1.1", "host2", ClientSourceARP)
<mask> assert.True(t, ok)
<mask> assert.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 </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.Nil(t, err) | <mask> assert.True(t, ok)
<mask>
<mask> ok, err = clients.AddHost("1.1.1.1", "host2", ClientSourceARP)
<mask> assert.True(t, ok)
<mask>
<mask> ok, err = clients.AddHost("1.1.1.1", "host3", ClientSourceHostsFile)
<mask> require.Nil(t, err)
<mask> assert.True(t, ok)
<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 assert.Nil(t, err)
</s> add </s> remove assert.Nil(t, err)
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/clients_test.go |
<mask> assert.Nil(t, err)
<mask>
<mask> ok, err = clients.AddHost("1.1.1.1", "host2", ClientSourceARP)
<mask> assert.True(t, ok)
<mask> assert.Nil(t, err)
<mask>
<mask> ok, err = clients.AddHost("1.1.1.1", "host3", ClientSourceHostsFile)
<mask> assert.True(t, ok)
<mask> assert.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 </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.Nil(t, err) | <mask> require.Nil(t, err)
<mask> assert.True(t, ok)
<mask>
<mask> ok, err = clients.AddHost("1.1.1.1", "host3", ClientSourceHostsFile)
<mask> assert.True(t, ok)
<mask>
<mask> assert.True(t, clients.Exists("1.1.1.1", ClientSourceHostsFile))
<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 assert.Nil(t, err)
</s> add </s> remove assert.True(t, ok)
</s> add require.True(t, ok) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/clients_test.go |
<mask> assert.Nil(t, err)
<mask>
<mask> ok, err = clients.AddHost("1.1.1.1", "host3", ClientSourceHostsFile)
<mask> assert.True(t, ok)
<mask> assert.Nil(t, err)
<mask>
<mask> assert.True(t, clients.Exists("1.1.1.1", ClientSourceHostsFile))
<mask> })
<mask>
<mask> t.Run("addhost_fail", 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 </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.Nil(t, err) | <mask>
<mask> t.Run("addhost_fail", func(t *testing.T) {
<mask> ok, err := clients.AddHost("1.1.1.1", "host1", ClientSourceRDNS)
<mask> assert.False(t, ok)
<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)
</s> add </s> remove assert.Nil(t, err)
</s> add </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"]) </s> remove assert.Nil(t, err)
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/clients_test.go |
<mask>
<mask> t.Run("addhost_fail", func(t *testing.T) {
<mask> ok, err := clients.AddHost("1.1.1.1", "host1", ClientSourceRDNS)
<mask> assert.False(t, ok)
<mask> assert.Nil(t, err)
<mask> })
<mask> }
<mask>
<mask> func TestClientsWhois(t *testing.T) {
<mask> var 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.Nil(t, err)
</s> add </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) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/clients_test.go | |
clients := clientsContainer{
testing: true,
} | <mask> })
<mask> }
<mask>
<mask> func TestClientsWhois(t *testing.T) {
<mask> var c *Client
<mask> clients := clientsContainer{}
<mask> clients.testing = true
<mask> clients.Init(nil, nil, nil)
<mask>
<mask> whois := [][]string{{"orgname", "orgname-val"}, {"country", "country-val"}}
<mask> // set whois info on new client
<mask> clients.SetWhoisInfo("1.1.1.255", whois)
</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 // set whois info on new client
clients.SetWhoisInfo("1.1.1.255", whois)
if assert.NotNil(t, clients.ipHost["1.1.1.255"]) {
</s> add t.Run("new_client", func(t *testing.T) {
clients.SetWhoisInfo("1.1.1.255", whois)
require.NotNil(t, clients.ipHost["1.1.1.255"]) </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])
}) </s> remove if assert.Len(t, h.WhoisInfo, 2) && assert.Len(t, h.WhoisInfo[0], 2) {
assert.Equal(t, "orgname-val", h.WhoisInfo[0][1])
}
}
</s> add </s> remove clients := clientsContainer{}
clients.testing = true
</s> add clients := clientsContainer{
testing: true,
} </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"))
})
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/clients_test.go |
t.Run("new_client", func(t *testing.T) {
clients.SetWhoisInfo("1.1.1.255", whois)
require.NotNil(t, clients.ipHost["1.1.1.255"]) | <mask> clients.testing = true
<mask> clients.Init(nil, nil, nil)
<mask>
<mask> whois := [][]string{{"orgname", "orgname-val"}, {"country", "country-val"}}
<mask> // set whois info on new client
<mask> clients.SetWhoisInfo("1.1.1.255", whois)
<mask> if assert.NotNil(t, clients.ipHost["1.1.1.255"]) {
<mask> h := clients.ipHost["1.1.1.255"]
<mask> if assert.Len(t, h.WhoisInfo, 2) && assert.Len(t, h.WhoisInfo[0], 2) {
<mask> assert.Equal(t, "orgname-val", h.WhoisInfo[0][1])
<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, h.WhoisInfo, 2) && assert.Len(t, h.WhoisInfo[0], 2) {
assert.Equal(t, "orgname-val", h.WhoisInfo[0][1])
}
}
</s> add </s> remove var c *Client
clients := clientsContainer{}
clients.testing = true
</s> add clients := clientsContainer{
testing: true,
} </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"]) </s> remove if assert.Len(t, h.WhoisInfo, 2) && assert.Len(t, h.WhoisInfo[0], 2) {
assert.Equal(t, "orgname-val", h.WhoisInfo[0][1])
}
}
</s> add </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",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/clients_test.go |
<mask> // set whois info on new client
<mask> clients.SetWhoisInfo("1.1.1.255", whois)
<mask> if assert.NotNil(t, clients.ipHost["1.1.1.255"]) {
<mask> h := clients.ipHost["1.1.1.255"]
<mask> if assert.Len(t, h.WhoisInfo, 2) && assert.Len(t, h.WhoisInfo[0], 2) {
<mask> assert.Equal(t, "orgname-val", h.WhoisInfo[0][1])
<mask> }
<mask> }
<mask>
<mask> // set whois info on existing auto-client
<mask> _, _ = clients.AddHost("1.1.1.1", "host", ClientSourceRDNS)
<mask> clients.SetWhoisInfo("1.1.1.1", whois)
<mask> if assert.NotNil(t, clients.ipHost["1.1.1.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 // 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"]) </s> remove // set whois info on new client
clients.SetWhoisInfo("1.1.1.255", whois)
if assert.NotNil(t, clients.ipHost["1.1.1.255"]) {
</s> add t.Run("new_client", func(t *testing.T) {
clients.SetWhoisInfo("1.1.1.255", whois)
require.NotNil(t, clients.ipHost["1.1.1.255"]) </s> remove if assert.Len(t, h.WhoisInfo, 2) && assert.Len(t, h.WhoisInfo[0], 2) {
assert.Equal(t, "orgname-val", h.WhoisInfo[0][1])
}
}
</s> add </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])
}) </s> remove var c *Client
clients := clientsContainer{}
clients.testing = true
</s> add clients := clientsContainer{
testing: true,
} | [
"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.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"]) | <mask> assert.Equal(t, "orgname-val", h.WhoisInfo[0][1])
<mask> }
<mask> }
<mask>
<mask> // set whois info on existing auto-client
<mask> _, _ = clients.AddHost("1.1.1.1", "host", ClientSourceRDNS)
<mask> clients.SetWhoisInfo("1.1.1.1", whois)
<mask> if assert.NotNil(t, clients.ipHost["1.1.1.1"]) {
<mask> h := clients.ipHost["1.1.1.1"]
<mask> if assert.Len(t, h.WhoisInfo, 2) && assert.Len(t, h.WhoisInfo[0], 2) {
<mask> assert.Equal(t, "orgname-val", h.WhoisInfo[0][1])
<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, h.WhoisInfo, 2) && assert.Len(t, h.WhoisInfo[0], 2) {
assert.Equal(t, "orgname-val", h.WhoisInfo[0][1])
}
}
</s> add </s> remove if assert.Len(t, h.WhoisInfo, 2) && assert.Len(t, h.WhoisInfo[0], 2) {
assert.Equal(t, "orgname-val", h.WhoisInfo[0][1])
}
}
</s> add </s> remove // set whois info on new client
clients.SetWhoisInfo("1.1.1.255", whois)
if assert.NotNil(t, clients.ipHost["1.1.1.255"]) {
</s> add t.Run("new_client", func(t *testing.T) {
clients.SetWhoisInfo("1.1.1.255", whois)
require.NotNil(t, clients.ipHost["1.1.1.255"]) </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])
}) </s> remove var c *Client
clients := clientsContainer{}
clients.testing = true
</s> add clients := clientsContainer{
testing: true,
} | [
"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> _, _ = clients.AddHost("1.1.1.1", "host", ClientSourceRDNS)
<mask> clients.SetWhoisInfo("1.1.1.1", whois)
<mask> if assert.NotNil(t, clients.ipHost["1.1.1.1"]) {
<mask> h := clients.ipHost["1.1.1.1"]
<mask> if assert.Len(t, h.WhoisInfo, 2) && assert.Len(t, h.WhoisInfo[0], 2) {
<mask> assert.Equal(t, "orgname-val", h.WhoisInfo[0][1])
<mask> }
<mask> }
<mask>
<mask> // Check that we cannot set whois info on a manually-added client
<mask> c = &Client{
<mask> IDs: []string{"1.1.1.2"},
<mask> Name: "client1",
</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 // 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"]) </s> remove if assert.Len(t, h.WhoisInfo, 2) && assert.Len(t, h.WhoisInfo[0], 2) {
assert.Equal(t, "orgname-val", h.WhoisInfo[0][1])
}
}
</s> add </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])
}) </s> remove // set whois info on new client
clients.SetWhoisInfo("1.1.1.255", whois)
if assert.NotNil(t, clients.ipHost["1.1.1.255"]) {
</s> add t.Run("new_client", func(t *testing.T) {
clients.SetWhoisInfo("1.1.1.255", whois)
require.NotNil(t, clients.ipHost["1.1.1.255"]) </s> remove var c *Client
clients := clientsContainer{}
clients.testing = true
</s> add clients := clientsContainer{
testing: true,
} | [
"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.Len(t, h.WhoisInfo, 2)
require.Len(t, h.WhoisInfo[0], 2)
assert.Equal(t, "orgname-val", h.WhoisInfo[0][1])
}) | <mask> assert.Equal(t, "orgname-val", h.WhoisInfo[0][1])
<mask> }
<mask> }
<mask>
<mask> // Check that we cannot set whois info on a manually-added client
<mask> c = &Client{
<mask> IDs: []string{"1.1.1.2"},
<mask> Name: "client1",
<mask> }
<mask> _, _ = clients.Add(c)
<mask> clients.SetWhoisInfo("1.1.1.2", whois)
<mask> assert.Nil(t, clients.ipHost["1.1.1.2"])
<mask> _ = clients.Del("client1")
<mask> }
<mask>
<mask> func TestClientsAddExisting(t *testing.T) {
<mask> var c *Client
<mask> clients := clientsContainer{}
<mask> clients.testing = 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 if assert.Len(t, h.WhoisInfo, 2) && assert.Len(t, h.WhoisInfo[0], 2) {
assert.Equal(t, "orgname-val", h.WhoisInfo[0][1])
}
}
</s> add </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 var c *Client
clients := clientsContainer{}
clients.testing = true
</s> add clients := clientsContainer{
testing: true,
} </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 if assert.Len(t, h.WhoisInfo, 2) && assert.Len(t, h.WhoisInfo[0], 2) {
assert.Equal(t, "orgname-val", h.WhoisInfo[0][1])
}
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/clients_test.go |
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) | <mask> assert.Nil(t, clients.ipHost["1.1.1.2"])
<mask> _ = clients.Del("client1")
<mask> }
<mask>
<mask> func TestClientsAddExisting(t *testing.T) {
<mask> var c *Client
<mask> clients := clientsContainer{}
<mask> clients.testing = true
<mask> clients.Init(nil, nil, nil)
<mask>
<mask> // some test variables
<mask> mac, _ := net.ParseMAC("aa:aa:aa:aa:aa:aa")
<mask> testIP := "1.2.3.4"
<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 // 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 // add a client
c = &Client{
IDs: []string{"1.1.1.1", "1:2:3::4", "aa:aa:aa:aa:aa:aa", "2.2.2.0/24"},
Name: "client1",
</s> add func TestClientsAddExisting(t *testing.T) {
clients := clientsContainer{
testing: true, </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])
}) </s> remove var c *Client
clients := clientsContainer{}
clients.testing = true
</s> add clients := clientsContainer{
testing: true,
} </s> remove clients := clientsContainer{}
clients.testing = true
</s> add clients := clientsContainer{
testing: true,
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/clients_test.go |
clients.SetWhoisInfo("1.1.1.2", whois)
require.Nil(t, clients.ipHost["1.1.1.2"])
assert.True(t, clients.Del("client1"))
})
} | <mask> clients := clientsContainer{}
<mask> clients.testing = true
<mask> clients.Init(nil, nil, nil)
<mask>
<mask> // some test variables
<mask> mac, _ := net.ParseMAC("aa:aa:aa:aa:aa:aa")
<mask> testIP := "1.2.3.4"
<mask>
<mask> // add a client
<mask> c = &Client{
<mask> IDs: []string{"1.1.1.1", "1:2:3::4", "aa:aa:aa:aa:aa:aa", "2.2.2.0/24"},
<mask> Name: "client1",
</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 // add a client
c = &Client{
IDs: []string{"1.1.1.1", "1:2:3::4", "aa:aa:aa:aa:aa:aa", "2.2.2.0/24"},
Name: "client1",
</s> add func TestClientsAddExisting(t *testing.T) {
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 clients := clientsContainer{}
clients.testing = true
</s> add clients := clientsContainer{
testing: true,
} </s> remove // add client with upstreams
c := &Client{
</s> add // Add client with upstreams.
ok, err := clients.Add(&Client{ </s> remove ok, err := clients.Add(c)
assert.True(t, ok)
assert.Nil(t, err)
</s> add clients.Init(nil, nil, nil) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/clients_test.go |
func TestClientsAddExisting(t *testing.T) {
clients := clientsContainer{
testing: true, | <mask> // some test variables
<mask> mac, _ := net.ParseMAC("aa:aa:aa:aa:aa:aa")
<mask> testIP := "1.2.3.4"
<mask>
<mask> // add a client
<mask> c = &Client{
<mask> IDs: []string{"1.1.1.1", "1:2:3::4", "aa:aa:aa:aa:aa:aa", "2.2.2.0/24"},
<mask> Name: "client1",
<mask> }
<mask> ok, err := clients.Add(c)
<mask> assert.True(t, ok)
<mask> assert.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 // 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 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 ok, err := clients.Add(c)
assert.True(t, ok)
assert.Nil(t, err)
</s> add clients.Init(nil, nil, nil) </s> remove // add an auto-client with the same IP - it's allowed
ok, err = clients.AddHost("1.1.1.1", "test", ClientSourceRDNS)
assert.True(t, ok)
assert.Nil(t, err)
</s> add t.Run("simple", func(t *testing.T) {
// Add a client.
ok, err := clients.Add(&Client{
IDs: []string{"1.1.1.1", "1:2:3::4", "aa:aa:aa:aa:aa:aa", "2.2.2.0/24"},
Name: "client1",
})
require.Nil(t, err)
assert.True(t, ok) </s> remove // add client with upstreams
c := &Client{
</s> add // Add client with upstreams.
ok, err := clients.Add(&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 |
clients.Init(nil, nil, nil) | <mask> c = &Client{
<mask> IDs: []string{"1.1.1.1", "1:2:3::4", "aa:aa:aa:aa:aa:aa", "2.2.2.0/24"},
<mask> Name: "client1",
<mask> }
<mask> ok, err := clients.Add(c)
<mask> assert.True(t, ok)
<mask> assert.Nil(t, err)
<mask>
<mask> // add an auto-client with the same IP - it's allowed
<mask> ok, err = clients.AddHost("1.1.1.1", "test", ClientSourceRDNS)
<mask> assert.True(t, ok)
<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 // add an auto-client with the same IP - it's allowed
ok, err = clients.AddHost("1.1.1.1", "test", ClientSourceRDNS)
assert.True(t, ok)
assert.Nil(t, err)
</s> add t.Run("simple", func(t *testing.T) {
// Add a client.
ok, err := clients.Add(&Client{
IDs: []string{"1.1.1.1", "1:2:3::4", "aa:aa:aa:aa:aa:aa", "2.2.2.0/24"},
Name: "client1",
})
require.Nil(t, err)
assert.True(t, ok) </s> remove // now some more complicated stuff
// first, init a DHCP server with a single static lease
config := dhcpd.ServerConfig{
DBFilePath: "leases.db",
}
defer func() { _ = os.Remove("leases.db") }()
clients.dhcpServer = dhcpd.Create(config)
err = clients.dhcpServer.AddStaticLease(dhcpd.Lease{
HWAddr: mac,
IP: net.ParseIP(testIP).To4(),
Hostname: "testhost",
Expiry: time.Now().Add(time.Hour),
</s> add // Now add an auto-client with the same IP.
ok, err = clients.AddHost("1.1.1.1", "test", ClientSourceRDNS)
require.Nil(t, err)
assert.True(t, ok) </s> remove // add a client
c = &Client{
IDs: []string{"1.1.1.1", "1:2:3::4", "aa:aa:aa:aa:aa:aa", "2.2.2.0/24"},
Name: "client1",
</s> add func TestClientsAddExisting(t *testing.T) {
clients := clientsContainer{
testing: true, </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} </s> remove // add a new client with the IP from the client1's IP range
c = &Client{
IDs: []string{"2.2.2.2"},
Name: "client3",
}
ok, err = clients.Add(c)
assert.True(t, ok)
assert.Nil(t, err)
</s> add // First, init a DHCP server with a single static lease.
config := dhcpd.ServerConfig{
DBFilePath: "leases.db",
}
clients.dhcpServer = dhcpd.Create(config)
t.Cleanup(func() { _ = os.Remove("leases.db") })
err := clients.dhcpServer.AddStaticLease(dhcpd.Lease{
HWAddr: net.HardwareAddr{0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA},
IP: testIP,
Hostname: "testhost",
Expiry: time.Now().Add(time.Hour),
})
require.Nil(t, err)
// Add a new client with the same IP as for a client with MAC.
ok, err := clients.Add(&Client{
IDs: []string{testIP.String()},
Name: "client2",
})
require.Nil(t, err)
assert.True(t, ok)
// Add a new client with the IP from the first client's IP
// range.
ok, err = clients.Add(&Client{
IDs: []string{"2.2.2.2"},
Name: "client3",
})
require.Nil(t, err)
assert.True(t, ok)
}) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/clients_test.go |
t.Run("simple", func(t *testing.T) {
// Add a client.
ok, err := clients.Add(&Client{
IDs: []string{"1.1.1.1", "1:2:3::4", "aa:aa:aa:aa:aa:aa", "2.2.2.0/24"},
Name: "client1",
})
require.Nil(t, err)
assert.True(t, ok) | <mask> ok, err := clients.Add(c)
<mask> assert.True(t, ok)
<mask> assert.Nil(t, err)
<mask>
<mask> // add an auto-client with the same IP - it's allowed
<mask> ok, err = clients.AddHost("1.1.1.1", "test", ClientSourceRDNS)
<mask> assert.True(t, ok)
<mask> assert.Nil(t, err)
<mask>
<mask> // now some more complicated stuff
<mask> // first, init a DHCP server with a single static lease
<mask> config := dhcpd.ServerConfig{
<mask> DBFilePath: "leases.db",
</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 // now some more complicated stuff
// first, init a DHCP server with a single static lease
config := dhcpd.ServerConfig{
DBFilePath: "leases.db",
}
defer func() { _ = os.Remove("leases.db") }()
clients.dhcpServer = dhcpd.Create(config)
err = clients.dhcpServer.AddStaticLease(dhcpd.Lease{
HWAddr: mac,
IP: net.ParseIP(testIP).To4(),
Hostname: "testhost",
Expiry: time.Now().Add(time.Hour),
</s> add // Now add an auto-client with the same IP.
ok, err = clients.AddHost("1.1.1.1", "test", ClientSourceRDNS)
require.Nil(t, err)
assert.True(t, ok) </s> remove ok, err := clients.Add(c)
assert.True(t, ok)
assert.Nil(t, err)
</s> add clients.Init(nil, nil, nil) </s> remove // add a new client with the IP from the client1's IP range
c = &Client{
IDs: []string{"2.2.2.2"},
Name: "client3",
}
ok, err = clients.Add(c)
assert.True(t, ok)
assert.Nil(t, err)
</s> add // First, init a DHCP server with a single static lease.
config := dhcpd.ServerConfig{
DBFilePath: "leases.db",
}
clients.dhcpServer = dhcpd.Create(config)
t.Cleanup(func() { _ = os.Remove("leases.db") })
err := clients.dhcpServer.AddStaticLease(dhcpd.Lease{
HWAddr: net.HardwareAddr{0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA},
IP: testIP,
Hostname: "testhost",
Expiry: time.Now().Add(time.Hour),
})
require.Nil(t, err)
// Add a new client with the same IP as for a client with MAC.
ok, err := clients.Add(&Client{
IDs: []string{testIP.String()},
Name: "client2",
})
require.Nil(t, err)
assert.True(t, ok)
// Add a new client with the IP from the first client's IP
// range.
ok, err = clients.Add(&Client{
IDs: []string{"2.2.2.2"},
Name: "client3",
})
require.Nil(t, err)
assert.True(t, ok)
}) </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} </s> remove assert.Nil(t, err)
</s> add | [
"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 |
// Now add an auto-client with the same IP.
ok, err = clients.AddHost("1.1.1.1", "test", ClientSourceRDNS)
require.Nil(t, err)
assert.True(t, ok) | <mask> ok, err = clients.AddHost("1.1.1.1", "test", ClientSourceRDNS)
<mask> assert.True(t, ok)
<mask> assert.Nil(t, err)
<mask>
<mask> // now some more complicated stuff
<mask> // first, init a DHCP server with a single static lease
<mask> config := dhcpd.ServerConfig{
<mask> DBFilePath: "leases.db",
<mask> }
<mask> defer func() { _ = os.Remove("leases.db") }()
<mask> clients.dhcpServer = dhcpd.Create(config)
<mask> err = clients.dhcpServer.AddStaticLease(dhcpd.Lease{
<mask> HWAddr: mac,
<mask> IP: net.ParseIP(testIP).To4(),
<mask> Hostname: "testhost",
<mask> Expiry: time.Now().Add(time.Hour),
<mask> })
<mask> assert.Nil(t, err)
<mask>
<mask> // add a new client with the same IP as for a client with MAC
<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 // add a new client with the IP from the client1's IP range
c = &Client{
IDs: []string{"2.2.2.2"},
Name: "client3",
}
ok, err = clients.Add(c)
assert.True(t, ok)
assert.Nil(t, err)
</s> add // First, init a DHCP server with a single static lease.
config := dhcpd.ServerConfig{
DBFilePath: "leases.db",
}
clients.dhcpServer = dhcpd.Create(config)
t.Cleanup(func() { _ = os.Remove("leases.db") })
err := clients.dhcpServer.AddStaticLease(dhcpd.Lease{
HWAddr: net.HardwareAddr{0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA},
IP: testIP,
Hostname: "testhost",
Expiry: time.Now().Add(time.Hour),
})
require.Nil(t, err)
// Add a new client with the same IP as for a client with MAC.
ok, err := clients.Add(&Client{
IDs: []string{testIP.String()},
Name: "client2",
})
require.Nil(t, err)
assert.True(t, ok)
// Add a new client with the IP from the first client's IP
// range.
ok, err = clients.Add(&Client{
IDs: []string{"2.2.2.2"},
Name: "client3",
})
require.Nil(t, err)
assert.True(t, ok)
}) </s> remove // add an auto-client with the same IP - it's allowed
ok, err = clients.AddHost("1.1.1.1", "test", ClientSourceRDNS)
assert.True(t, ok)
assert.Nil(t, err)
</s> add t.Run("simple", func(t *testing.T) {
// Add a client.
ok, err := clients.Add(&Client{
IDs: []string{"1.1.1.1", "1:2:3::4", "aa:aa:aa:aa:aa:aa", "2.2.2.0/24"},
Name: "client1",
})
require.Nil(t, err)
assert.True(t, ok) </s> remove assert.Nil(t, err)
</s> add </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} </s> remove ok, err := clients.Add(c)
assert.True(t, ok)
assert.Nil(t, err)
</s> add clients.Init(nil, nil, nil) | [
"keep",
"keep",
"keep",
"keep",
"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/home/clients_test.go |
<mask> IP: net.ParseIP(testIP).To4(),
<mask> Hostname: "testhost",
<mask> Expiry: time.Now().Add(time.Hour),
<mask> })
<mask> assert.Nil(t, err)
<mask>
<mask> // add a new client with the same IP as for a client with MAC
<mask> c = &Client{
<mask> IDs: []string{testIP},
<mask> Name: "client2",
</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 // 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} </s> remove // now some more complicated stuff
// first, init a DHCP server with a single static lease
config := dhcpd.ServerConfig{
DBFilePath: "leases.db",
}
defer func() { _ = os.Remove("leases.db") }()
clients.dhcpServer = dhcpd.Create(config)
err = clients.dhcpServer.AddStaticLease(dhcpd.Lease{
HWAddr: mac,
IP: net.ParseIP(testIP).To4(),
Hostname: "testhost",
Expiry: time.Now().Add(time.Hour),
</s> add // Now add an auto-client with the same IP.
ok, err = clients.AddHost("1.1.1.1", "test", ClientSourceRDNS)
require.Nil(t, err)
assert.True(t, ok) </s> remove // add a new client with the IP from the client1's IP range
c = &Client{
IDs: []string{"2.2.2.2"},
Name: "client3",
}
ok, err = clients.Add(c)
assert.True(t, ok)
assert.Nil(t, err)
</s> add // First, init a DHCP server with a single static lease.
config := dhcpd.ServerConfig{
DBFilePath: "leases.db",
}
clients.dhcpServer = dhcpd.Create(config)
t.Cleanup(func() { _ = os.Remove("leases.db") })
err := clients.dhcpServer.AddStaticLease(dhcpd.Lease{
HWAddr: net.HardwareAddr{0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA},
IP: testIP,
Hostname: "testhost",
Expiry: time.Now().Add(time.Hour),
})
require.Nil(t, err)
// Add a new client with the same IP as for a client with MAC.
ok, err := clients.Add(&Client{
IDs: []string{testIP.String()},
Name: "client2",
})
require.Nil(t, err)
assert.True(t, ok)
// Add a new client with the IP from the first client's IP
// range.
ok, err = clients.Add(&Client{
IDs: []string{"2.2.2.2"},
Name: "client3",
})
require.Nil(t, err)
assert.True(t, ok)
}) </s> remove // add client with upstreams
c := &Client{
</s> add // Add client with upstreams.
ok, err := clients.Add(&Client{ </s> remove ok, err := clients.Add(c)
assert.True(t, ok)
assert.Nil(t, err)
</s> add clients.Init(nil, nil, nil) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/clients_test.go | |
t.Run("complicated", func(t *testing.T) {
testIP := net.IP{1, 2, 3, 4} | <mask> Expiry: time.Now().Add(time.Hour),
<mask> })
<mask> assert.Nil(t, err)
<mask>
<mask> // add a new client with the same IP as for a client with MAC
<mask> c = &Client{
<mask> IDs: []string{testIP},
<mask> Name: "client2",
<mask> }
<mask> ok, err = clients.Add(c)
<mask> assert.True(t, ok)
<mask> assert.Nil(t, err)
<mask>
<mask> // add a new client with the IP from the client1's IP range
<mask> c = &Client{
<mask> IDs: []string{"2.2.2.2"},
<mask> Name: "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, err)
</s> add </s> remove // add a new client with the IP from the client1's IP range
c = &Client{
IDs: []string{"2.2.2.2"},
Name: "client3",
}
ok, err = clients.Add(c)
assert.True(t, ok)
assert.Nil(t, err)
</s> add // First, init a DHCP server with a single static lease.
config := dhcpd.ServerConfig{
DBFilePath: "leases.db",
}
clients.dhcpServer = dhcpd.Create(config)
t.Cleanup(func() { _ = os.Remove("leases.db") })
err := clients.dhcpServer.AddStaticLease(dhcpd.Lease{
HWAddr: net.HardwareAddr{0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA},
IP: testIP,
Hostname: "testhost",
Expiry: time.Now().Add(time.Hour),
})
require.Nil(t, err)
// Add a new client with the same IP as for a client with MAC.
ok, err := clients.Add(&Client{
IDs: []string{testIP.String()},
Name: "client2",
})
require.Nil(t, err)
assert.True(t, ok)
// Add a new client with the IP from the first client's IP
// range.
ok, err = clients.Add(&Client{
IDs: []string{"2.2.2.2"},
Name: "client3",
})
require.Nil(t, err)
assert.True(t, ok)
}) </s> remove // now some more complicated stuff
// first, init a DHCP server with a single static lease
config := dhcpd.ServerConfig{
DBFilePath: "leases.db",
}
defer func() { _ = os.Remove("leases.db") }()
clients.dhcpServer = dhcpd.Create(config)
err = clients.dhcpServer.AddStaticLease(dhcpd.Lease{
HWAddr: mac,
IP: net.ParseIP(testIP).To4(),
Hostname: "testhost",
Expiry: time.Now().Add(time.Hour),
</s> add // Now add an auto-client with the same IP.
ok, err = clients.AddHost("1.1.1.1", "test", ClientSourceRDNS)
require.Nil(t, err)
assert.True(t, ok) </s> remove ok, err := clients.Add(c)
assert.True(t, ok)
assert.Nil(t, err)
</s> add clients.Init(nil, nil, nil) </s> remove // add an auto-client with the same IP - it's allowed
ok, err = clients.AddHost("1.1.1.1", "test", ClientSourceRDNS)
assert.True(t, ok)
assert.Nil(t, err)
</s> add t.Run("simple", func(t *testing.T) {
// Add a client.
ok, err := clients.Add(&Client{
IDs: []string{"1.1.1.1", "1:2:3::4", "aa:aa:aa:aa:aa:aa", "2.2.2.0/24"},
Name: "client1",
})
require.Nil(t, err)
assert.True(t, ok) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/clients_test.go |
// First, init a DHCP server with a single static lease.
config := dhcpd.ServerConfig{
DBFilePath: "leases.db",
}
clients.dhcpServer = dhcpd.Create(config)
t.Cleanup(func() { _ = os.Remove("leases.db") })
err := clients.dhcpServer.AddStaticLease(dhcpd.Lease{
HWAddr: net.HardwareAddr{0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA},
IP: testIP,
Hostname: "testhost",
Expiry: time.Now().Add(time.Hour),
})
require.Nil(t, err)
// Add a new client with the same IP as for a client with MAC.
ok, err := clients.Add(&Client{
IDs: []string{testIP.String()},
Name: "client2",
})
require.Nil(t, err)
assert.True(t, ok)
// Add a new client with the IP from the first client's IP
// range.
ok, err = clients.Add(&Client{
IDs: []string{"2.2.2.2"},
Name: "client3",
})
require.Nil(t, err)
assert.True(t, ok)
}) | <mask> ok, err = clients.Add(c)
<mask> assert.True(t, ok)
<mask> assert.Nil(t, err)
<mask>
<mask> // add a new client with the IP from the client1's IP range
<mask> c = &Client{
<mask> IDs: []string{"2.2.2.2"},
<mask> Name: "client3",
<mask> }
<mask> ok, err = clients.Add(c)
<mask> assert.True(t, ok)
<mask> assert.Nil(t, err)
<mask> }
<mask>
<mask> func TestClientsCustomUpstream(t *testing.T) {
<mask> clients := clientsContainer{}
<mask> clients.testing = 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 // 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} </s> remove ok, err := clients.Add(c)
assert.True(t, ok)
assert.Nil(t, err)
</s> add clients.Init(nil, nil, nil) </s> remove // now some more complicated stuff
// first, init a DHCP server with a single static lease
config := dhcpd.ServerConfig{
DBFilePath: "leases.db",
}
defer func() { _ = os.Remove("leases.db") }()
clients.dhcpServer = dhcpd.Create(config)
err = clients.dhcpServer.AddStaticLease(dhcpd.Lease{
HWAddr: mac,
IP: net.ParseIP(testIP).To4(),
Hostname: "testhost",
Expiry: time.Now().Add(time.Hour),
</s> add // Now add an auto-client with the same IP.
ok, err = clients.AddHost("1.1.1.1", "test", ClientSourceRDNS)
require.Nil(t, err)
assert.True(t, ok) </s> remove clients := clientsContainer{}
clients.testing = true
</s> add clients := clientsContainer{
testing: true,
} </s> remove assert.Nil(t, err)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/clients_test.go |
clients := clientsContainer{
testing: true,
} | <mask> assert.Nil(t, err)
<mask> }
<mask>
<mask> func TestClientsCustomUpstream(t *testing.T) {
<mask> clients := clientsContainer{}
<mask> clients.testing = true
<mask>
<mask> clients.Init(nil, nil, nil)
<mask>
<mask> // add client with upstreams
<mask> c := &Client{
<mask> IDs: []string{"1.1.1.1", "1:2:3::4", "aa:aa:aa:aa:aa:aa"},
</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 // add client with upstreams
c := &Client{
</s> add // Add client with upstreams.
ok, err := clients.Add(&Client{ </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 var c *Client
clients := clientsContainer{}
clients.testing = true
</s> add clients := clientsContainer{
testing: true,
} </s> remove ok, err := clients.Add(c)
assert.True(t, ok)
assert.Nil(t, err)
</s> add clients.Init(nil, nil, nil) </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) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/clients_test.go |
// Add client with upstreams.
ok, err := clients.Add(&Client{ | <mask> clients.testing = true
<mask>
<mask> clients.Init(nil, nil, nil)
<mask>
<mask> // add client with upstreams
<mask> c := &Client{
<mask> IDs: []string{"1.1.1.1", "1:2:3::4", "aa:aa:aa:aa:aa:aa"},
<mask> Name: "client1",
<mask> Upstreams: []string{
<mask> "1.1.1.1",
<mask> "[/example.org/]8.8.8.8",
</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 // 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 ok, err := clients.Add(c)
assert.True(t, ok)
assert.Nil(t, err)
</s> add clients.Init(nil, nil, nil) </s> remove // add a client
c = &Client{
IDs: []string{"1.1.1.1", "1:2:3::4", "aa:aa:aa:aa:aa:aa", "2.2.2.0/24"},
Name: "client1",
</s> add func TestClientsAddExisting(t *testing.T) {
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) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/clients_test.go |
})
require.Nil(t, err) | <mask> Upstreams: []string{
<mask> "1.1.1.1",
<mask> "[/example.org/]8.8.8.8",
<mask> },
<mask> }
<mask> ok, err := clients.Add(c)
<mask> assert.Nil(t, err)
<mask> assert.True(t, ok)
<mask>
<mask> config := clients.FindUpstreams("1.2.3.4")
<mask> assert.Nil(t, config)
<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 // add client with upstreams
c := &Client{
</s> add // Add client with upstreams.
ok, err := clients.Add(&Client{ </s> remove assert.NotNil(t, config)
assert.Equal(t, 1, len(config.Upstreams))
assert.Equal(t, 1, len(config.DomainReservedUpstreams))
</s> add require.NotNil(t, config)
assert.Len(t, config.Upstreams, 1)
assert.Len(t, config.DomainReservedUpstreams, 1) </s> remove assert.Nil(t, err)
</s> add </s> remove // add an auto-client with the same IP - it's allowed
ok, err = clients.AddHost("1.1.1.1", "test", ClientSourceRDNS)
assert.True(t, ok)
assert.Nil(t, err)
</s> add t.Run("simple", func(t *testing.T) {
// Add a client.
ok, err := clients.Add(&Client{
IDs: []string{"1.1.1.1", "1:2:3::4", "aa:aa:aa:aa:aa:aa", "2.2.2.0/24"},
Name: "client1",
})
require.Nil(t, err)
assert.True(t, ok) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/clients_test.go |
require.NotNil(t, config)
assert.Len(t, config.Upstreams, 1)
assert.Len(t, config.DomainReservedUpstreams, 1) | <mask> config := clients.FindUpstreams("1.2.3.4")
<mask> assert.Nil(t, config)
<mask>
<mask> config = clients.FindUpstreams("1.1.1.1")
<mask> assert.NotNil(t, config)
<mask> assert.Equal(t, 1, len(config.Upstreams))
<mask> assert.Equal(t, 1, len(config.DomainReservedUpstreams))
<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 }
ok, err := clients.Add(c)
assert.Nil(t, err)
</s> add })
require.Nil(t, err) </s> remove if testParseOk(t).configFilename != "" {
t.Fatal("empty is no config filename")
}
if testParseOk(t, "-c", "path").configFilename != "path" {
t.Fatal("-c is config filename")
}
</s> add assert.Equal(t, "", testParseOK(t).configFilename, "empty is no config filename")
assert.Equal(t, "path", testParseOK(t, "-c", "path").configFilename, "-c is config filename") </s> remove func TestIsBlockedIPDisallowed(t *testing.T) {
a := &accessCtx{}
assert.Nil(t, a.Init(nil, []string{"1.1.1.1", "2.2.0.0/16"}, nil))
disallowed, disallowedRule := a.IsBlockedIP(net.IPv4(1, 1, 1, 1))
assert.True(t, disallowed)
assert.Equal(t, "1.1.1.1", disallowedRule)
disallowed, disallowedRule = a.IsBlockedIP(net.IPv4(1, 1, 1, 2))
assert.False(t, disallowed)
assert.Empty(t, disallowedRule)
disallowed, disallowedRule = a.IsBlockedIP(net.IPv4(2, 2, 1, 1))
assert.True(t, disallowed)
assert.Equal(t, "2.2.0.0/16", disallowedRule)
disallowed, disallowedRule = a.IsBlockedIP(net.IPv4(2, 3, 1, 1))
assert.False(t, disallowed)
assert.Empty(t, disallowedRule)
}
func TestIsBlockedIPBlockedDomain(t *testing.T) {
a := &accessCtx{}
assert.True(t, a.Init(nil, nil, []string{
</s> add func TestIsBlockedDomain(t *testing.T) {
aCtx := &accessCtx{}
require.Nil(t, aCtx.Init(nil, nil, []string{ </s> remove func TestIsBlockedIPAllowed(t *testing.T) {
a := &accessCtx{}
assert.Nil(t, a.Init([]string{"1.1.1.1", "2.2.0.0/16"}, nil, nil))
disallowed, disallowedRule := a.IsBlockedIP(net.IPv4(1, 1, 1, 1))
assert.False(t, disallowed)
assert.Empty(t, disallowedRule)
disallowed, disallowedRule = a.IsBlockedIP(net.IPv4(1, 1, 1, 2))
assert.True(t, disallowed)
assert.Empty(t, disallowedRule)
disallowed, disallowedRule = a.IsBlockedIP(net.IPv4(2, 2, 1, 1))
assert.False(t, disallowed)
assert.Empty(t, disallowedRule)
disallowed, disallowedRule = a.IsBlockedIP(net.IPv4(2, 3, 1, 1))
assert.True(t, disallowed)
assert.Empty(t, disallowedRule)
</s> add func TestIsBlockedIP(t *testing.T) {
const (
ip int = iota
cidr
)
rules := []string{
ip: "1.1.1.1",
cidr: "2.2.0.0/16",
}
testCases := []struct {
name string
allowed bool
ip net.IP
wantDis bool
wantRule string
}{{
name: "allow_ip",
allowed: true,
ip: net.IPv4(1, 1, 1, 1),
wantDis: false,
wantRule: "",
}, {
name: "disallow_ip",
allowed: true,
ip: net.IPv4(1, 1, 1, 2),
wantDis: true,
wantRule: "",
}, {
name: "allow_cidr",
allowed: true,
ip: net.IPv4(2, 2, 1, 1),
wantDis: false,
wantRule: "",
}, {
name: "disallow_cidr",
allowed: true,
ip: net.IPv4(2, 3, 1, 1),
wantDis: true,
wantRule: "",
}, {
name: "allow_ip",
allowed: false,
ip: net.IPv4(1, 1, 1, 1),
wantDis: true,
wantRule: rules[ip],
}, {
name: "disallow_ip",
allowed: false,
ip: net.IPv4(1, 1, 1, 2),
wantDis: false,
wantRule: "",
}, {
name: "allow_cidr",
allowed: false,
ip: net.IPv4(2, 2, 1, 1),
wantDis: true,
wantRule: rules[cidr],
}, {
name: "disallow_cidr",
allowed: false,
ip: net.IPv4(2, 3, 1, 1),
wantDis: false,
wantRule: "",
}}
for _, tc := range testCases {
prefix := "allowed_"
if !tc.allowed {
prefix = "disallowed_"
}
t.Run(prefix+tc.name, func(t *testing.T) {
aCtx := &accessCtx{}
allowedRules := rules
var disallowedRules []string
if !tc.allowed {
allowedRules, disallowedRules = disallowedRules, allowedRules
}
require.Nil(t, aCtx.Init(allowedRules, disallowedRules, nil))
disallowed, rule := aCtx.IsBlockedIP(tc.ip)
assert.Equal(t, tc.wantDis, disallowed)
assert.Equal(t, tc.wantRule, rule)
})
} </s> remove if testParseOk(t, "--config", "path").configFilename != "path" {
t.Fatal("--configFilename is config filename")
}
</s> add assert.Equal(t, "path", testParseOK(t, "--config", "path").configFilename, "--config is config filename") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/clients_test.go |
<mask>
<mask> import (
<mask> "testing"
<mask> "time"
<mask> )
<mask>
<mask> /* Tests performed:
<mask> . Bad certificate
<mask> . Bad private key
<mask> . Valid certificate & private key */
<mask> func TestValidateCertificates(t *testing.T) {
<mask> var data tlsConfigStatus
<mask>
<mask> // bad cert
<mask> data = validateCertificates("bad cert", "", "")
<mask> if !(data.WarningValidation != "" &&
<mask> !data.ValidCert &&
</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 // bad cert
data = validateCertificates("bad cert", "", "")
if !(data.WarningValidation != "" &&
!data.ValidCert &&
!data.ValidChain) {
t.Fatalf("bad cert: validateCertificates(): %v", data)
}
// bad priv key
data = validateCertificates("", "bad priv key", "")
if !(data.WarningValidation != "" &&
!data.ValidKey) {
t.Fatalf("bad priv key: validateCertificates(): %v", data)
}
</s> add "github.com/stretchr/testify/assert"
) </s> remove data = validateCertificates(CertificateChain, PrivateKey, "")
notBefore, _ := time.Parse(time.RFC3339, "2019-02-27T09:24:23Z")
notAfter, _ := time.Parse(time.RFC3339, "2046-07-14T09:24:23Z")
if !(data.WarningValidation != "" /* self signed */ &&
data.ValidCert &&
!data.ValidChain &&
data.ValidKey &&
data.KeyType == "RSA" &&
data.Subject == "CN=AdGuard Home,O=AdGuard Ltd" &&
data.Issuer == "CN=AdGuard Home,O=AdGuard Ltd" &&
data.NotBefore.Equal(notBefore) &&
data.NotAfter.Equal(notAfter) &&
// data.DNSNames[0] == &&
data.ValidPair) {
t.Fatalf("valid cert & priv key: validateCertificates(): %v", data)
}
</s> add )
func TestValidateCertificates(t *testing.T) {
t.Run("bad_certificate", func(t *testing.T) {
data := validateCertificates("bad cert", "", "")
assert.NotEmpty(t, data.WarningValidation)
assert.False(t, data.ValidCert)
assert.False(t, data.ValidChain)
})
t.Run("bad_private_key", func(t *testing.T) {
data := validateCertificates("", "bad priv key", "")
assert.NotEmpty(t, data.WarningValidation)
assert.False(t, data.ValidKey)
})
t.Run("valid", func(t *testing.T) {
data := validateCertificates(CertificateChain, PrivateKey, "")
notBefore, _ := time.Parse(time.RFC3339, "2019-02-27T09:24:23Z")
notAfter, _ := time.Parse(time.RFC3339, "2046-07-14T09:24:23Z")
assert.NotEmpty(t, data.WarningValidation)
assert.True(t, data.ValidCert)
assert.False(t, data.ValidChain)
assert.True(t, data.ValidKey)
assert.Equal(t, "RSA", data.KeyType)
assert.Equal(t, "CN=AdGuard Home,O=AdGuard Ltd", data.Subject)
assert.Equal(t, "CN=AdGuard Home,O=AdGuard Ltd", data.Issuer)
assert.Equal(t, notBefore, data.NotBefore)
assert.Equal(t, notAfter, data.NotAfter)
assert.True(t, data.ValidPair)
}) </s> remove "os"
</s> add </s> remove // valid cert & priv key
CertificateChain := `-----BEGIN CERTIFICATE-----
</s> add const (
CertificateChain = `-----BEGIN CERTIFICATE----- </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)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/control_test.go | |
"github.com/stretchr/testify/assert"
) | <mask> . Valid certificate & private key */
<mask> func TestValidateCertificates(t *testing.T) {
<mask> var data tlsConfigStatus
<mask>
<mask> // bad cert
<mask> data = validateCertificates("bad cert", "", "")
<mask> if !(data.WarningValidation != "" &&
<mask> !data.ValidCert &&
<mask> !data.ValidChain) {
<mask> t.Fatalf("bad cert: validateCertificates(): %v", data)
<mask> }
<mask>
<mask> // bad priv key
<mask> data = validateCertificates("", "bad priv key", "")
<mask> if !(data.WarningValidation != "" &&
<mask> !data.ValidKey) {
<mask> t.Fatalf("bad priv key: validateCertificates(): %v", data)
<mask> }
<mask>
<mask> // valid cert & priv key
<mask> CertificateChain := `-----BEGIN CERTIFICATE-----
<mask> MIICKzCCAZSgAwIBAgIJAMT9kPVJdM7LMA0GCSqGSIb3DQEBCwUAMC0xFDASBgNV
<mask> BAoMC0FkR3VhcmQgTHRkMRUwEwYDVQQDDAxBZEd1YXJkIEhvbWUwHhcNMTkwMjI3
</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 </s> remove // valid cert & priv key
CertificateChain := `-----BEGIN CERTIFICATE-----
</s> add const (
CertificateChain = `-----BEGIN CERTIFICATE----- </s> remove data = validateCertificates(CertificateChain, PrivateKey, "")
notBefore, _ := time.Parse(time.RFC3339, "2019-02-27T09:24:23Z")
notAfter, _ := time.Parse(time.RFC3339, "2046-07-14T09:24:23Z")
if !(data.WarningValidation != "" /* self signed */ &&
data.ValidCert &&
!data.ValidChain &&
data.ValidKey &&
data.KeyType == "RSA" &&
data.Subject == "CN=AdGuard Home,O=AdGuard Ltd" &&
data.Issuer == "CN=AdGuard Home,O=AdGuard Ltd" &&
data.NotBefore.Equal(notBefore) &&
data.NotAfter.Equal(notAfter) &&
// data.DNSNames[0] == &&
data.ValidPair) {
t.Fatalf("valid cert & priv key: validateCertificates(): %v", data)
}
</s> add )
func TestValidateCertificates(t *testing.T) {
t.Run("bad_certificate", func(t *testing.T) {
data := validateCertificates("bad cert", "", "")
assert.NotEmpty(t, data.WarningValidation)
assert.False(t, data.ValidCert)
assert.False(t, data.ValidChain)
})
t.Run("bad_private_key", func(t *testing.T) {
data := validateCertificates("", "bad priv key", "")
assert.NotEmpty(t, data.WarningValidation)
assert.False(t, data.ValidKey)
})
t.Run("valid", func(t *testing.T) {
data := validateCertificates(CertificateChain, PrivateKey, "")
notBefore, _ := time.Parse(time.RFC3339, "2019-02-27T09:24:23Z")
notAfter, _ := time.Parse(time.RFC3339, "2046-07-14T09:24:23Z")
assert.NotEmpty(t, data.WarningValidation)
assert.True(t, data.ValidCert)
assert.False(t, data.ValidChain)
assert.True(t, data.ValidKey)
assert.Equal(t, "RSA", data.KeyType)
assert.Equal(t, "CN=AdGuard Home,O=AdGuard Ltd", data.Subject)
assert.Equal(t, "CN=AdGuard Home,O=AdGuard Ltd", data.Issuer)
assert.Equal(t, notBefore, data.NotBefore)
assert.Equal(t, notAfter, data.NotAfter)
assert.True(t, data.ValidPair)
}) </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 if testParseOk(t).logFile != "" {
t.Fatal("empty is no log file")
}
if testParseOk(t, "-l", "path").logFile != "path" {
t.Fatal("-l is log file")
}
if testParseOk(t, "--logfile", "path").logFile != "path" {
t.Fatal("--logfile is log file")
}
</s> add assert.Equal(t, "", testParseOK(t).logFile, "empty is no log file")
assert.Equal(t, "path", testParseOK(t, "-l", "path").logFile, "-l is log file")
assert.Equal(t, "path", testParseOK(t, "--logfile", "path").logFile, "--logfile is log file") | [
"keep",
"keep",
"keep",
"keep",
"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/home/control_test.go |
const (
CertificateChain = `-----BEGIN CERTIFICATE----- | <mask> !data.ValidKey) {
<mask> t.Fatalf("bad priv key: validateCertificates(): %v", data)
<mask> }
<mask>
<mask> // valid cert & priv key
<mask> CertificateChain := `-----BEGIN CERTIFICATE-----
<mask> MIICKzCCAZSgAwIBAgIJAMT9kPVJdM7LMA0GCSqGSIb3DQEBCwUAMC0xFDASBgNV
<mask> BAoMC0FkR3VhcmQgTHRkMRUwEwYDVQQDDAxBZEd1YXJkIEhvbWUwHhcNMTkwMjI3
<mask> MDkyNDIzWhcNNDYwNzE0MDkyNDIzWjAtMRQwEgYDVQQKDAtBZEd1YXJkIEx0ZDEV
<mask> MBMGA1UEAwwMQWRHdWFyZCBIb21lMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
<mask> gQCwvwUnPJiOvLcOaWmGu6Y68ksFr13nrXBcsDlhxlXy8PaohVi3XxEmt2OrVjKW
</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 // bad cert
data = validateCertificates("bad cert", "", "")
if !(data.WarningValidation != "" &&
!data.ValidCert &&
!data.ValidChain) {
t.Fatalf("bad cert: validateCertificates(): %v", data)
}
// bad priv key
data = validateCertificates("", "bad priv key", "")
if !(data.WarningValidation != "" &&
!data.ValidKey) {
t.Fatalf("bad priv key: validateCertificates(): %v", data)
}
</s> add "github.com/stretchr/testify/assert"
) </s> remove data = validateCertificates(CertificateChain, PrivateKey, "")
notBefore, _ := time.Parse(time.RFC3339, "2019-02-27T09:24:23Z")
notAfter, _ := time.Parse(time.RFC3339, "2046-07-14T09:24:23Z")
if !(data.WarningValidation != "" /* self signed */ &&
data.ValidCert &&
!data.ValidChain &&
data.ValidKey &&
data.KeyType == "RSA" &&
data.Subject == "CN=AdGuard Home,O=AdGuard Ltd" &&
data.Issuer == "CN=AdGuard Home,O=AdGuard Ltd" &&
data.NotBefore.Equal(notBefore) &&
data.NotAfter.Equal(notAfter) &&
// data.DNSNames[0] == &&
data.ValidPair) {
t.Fatalf("valid cert & priv key: validateCertificates(): %v", data)
}
</s> add )
func TestValidateCertificates(t *testing.T) {
t.Run("bad_certificate", func(t *testing.T) {
data := validateCertificates("bad cert", "", "")
assert.NotEmpty(t, data.WarningValidation)
assert.False(t, data.ValidCert)
assert.False(t, data.ValidChain)
})
t.Run("bad_private_key", func(t *testing.T) {
data := validateCertificates("", "bad priv key", "")
assert.NotEmpty(t, data.WarningValidation)
assert.False(t, data.ValidKey)
})
t.Run("valid", func(t *testing.T) {
data := validateCertificates(CertificateChain, PrivateKey, "")
notBefore, _ := time.Parse(time.RFC3339, "2019-02-27T09:24:23Z")
notAfter, _ := time.Parse(time.RFC3339, "2046-07-14T09:24:23Z")
assert.NotEmpty(t, data.WarningValidation)
assert.True(t, data.ValidCert)
assert.False(t, data.ValidChain)
assert.True(t, data.ValidKey)
assert.Equal(t, "RSA", data.KeyType)
assert.Equal(t, "CN=AdGuard Home,O=AdGuard Ltd", data.Subject)
assert.Equal(t, "CN=AdGuard Home,O=AdGuard Ltd", data.Issuer)
assert.Equal(t, notBefore, data.NotBefore)
assert.Equal(t, notAfter, data.NotAfter)
assert.True(t, data.ValidPair)
}) </s> remove )
/* Tests performed:
. Bad certificate
. Bad private key
. Valid certificate & private key */
func TestValidateCertificates(t *testing.T) {
var data tlsConfigStatus
</s> add </s> remove PrivateKey := `-----BEGIN PRIVATE KEY-----
</s> add PrivateKey = `-----BEGIN PRIVATE KEY----- </s> remove if assert.NotEmpty(t, res.Rules, "Expected result to have rules") {
r := res.Rules[0]
assert.NotNilf(t, r.IP, "Expected ip %s to match, actual: %v", ip, r.IP)
assert.Equalf(t, ip, r.IP.String(), "Expected ip %s to match, actual: %v", ip, r.IP)
}
</s> add require.NotEmpty(t, res.Rules, "Expected result to have rules")
r := res.Rules[0]
require.NotNilf(t, r.IP, "Expected ip %s to match, actual: %v", ip, r.IP)
assert.Equalf(t, ip, r.IP.String(), "Expected ip %s to match, actual: %v", ip, r.IP) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/control_test.go |
PrivateKey = `-----BEGIN PRIVATE KEY----- | <mask> LwlXfbakf7qkVTlCNXgoY7RaJ8rJdPgOZPoCTVToEhT6u/cb1c2qp8QB0dNExDna
<mask> b0Z+dnODTZqQOJo6z/wIXlcUrnR4cQVvytXt8lFn+26l6Y6EMI26twC/xWr+1swq
<mask> Muj4FeWHVDerquH4yMr1jsYLD3ci+kc5sbIX6TfVxQ==
<mask> -----END CERTIFICATE-----`
<mask> PrivateKey := `-----BEGIN PRIVATE KEY-----
<mask> MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBALC/BSc8mI68tw5p
<mask> aYa7pjrySwWvXeetcFywOWHGVfLw9qiFWLdfESa3Y6tWMpZAXD9t1Xh9n211YUBV
<mask> FGSB4ZshnM/tgEPU6t787lJD4NsIIRp++MkJxdAitN4oUTqL0bdpIwezQ/CrYuBX
<mask> xTmZii0uu/IWITxA8iclsMMyloVjAgMBAAECgYEAmjzoG1h27UDkIlB9BVWl95TP
<mask> QVPLB81D267xNFDnWk1Lgr5zL/pnNjkdYjyjgpkBp1yKyE4gHV4skv5sAFWTcOCU
</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 // valid cert & priv key
CertificateChain := `-----BEGIN CERTIFICATE-----
</s> add const (
CertificateChain = `-----BEGIN CERTIFICATE----- </s> remove data = validateCertificates(CertificateChain, PrivateKey, "")
notBefore, _ := time.Parse(time.RFC3339, "2019-02-27T09:24:23Z")
notAfter, _ := time.Parse(time.RFC3339, "2046-07-14T09:24:23Z")
if !(data.WarningValidation != "" /* self signed */ &&
data.ValidCert &&
!data.ValidChain &&
data.ValidKey &&
data.KeyType == "RSA" &&
data.Subject == "CN=AdGuard Home,O=AdGuard Ltd" &&
data.Issuer == "CN=AdGuard Home,O=AdGuard Ltd" &&
data.NotBefore.Equal(notBefore) &&
data.NotAfter.Equal(notAfter) &&
// data.DNSNames[0] == &&
data.ValidPair) {
t.Fatalf("valid cert & priv key: validateCertificates(): %v", data)
}
</s> add )
func TestValidateCertificates(t *testing.T) {
t.Run("bad_certificate", func(t *testing.T) {
data := validateCertificates("bad cert", "", "")
assert.NotEmpty(t, data.WarningValidation)
assert.False(t, data.ValidCert)
assert.False(t, data.ValidChain)
})
t.Run("bad_private_key", func(t *testing.T) {
data := validateCertificates("", "bad priv key", "")
assert.NotEmpty(t, data.WarningValidation)
assert.False(t, data.ValidKey)
})
t.Run("valid", func(t *testing.T) {
data := validateCertificates(CertificateChain, PrivateKey, "")
notBefore, _ := time.Parse(time.RFC3339, "2019-02-27T09:24:23Z")
notAfter, _ := time.Parse(time.RFC3339, "2046-07-14T09:24:23Z")
assert.NotEmpty(t, data.WarningValidation)
assert.True(t, data.ValidCert)
assert.False(t, data.ValidChain)
assert.True(t, data.ValidKey)
assert.Equal(t, "RSA", data.KeyType)
assert.Equal(t, "CN=AdGuard Home,O=AdGuard Ltd", data.Subject)
assert.Equal(t, "CN=AdGuard Home,O=AdGuard Ltd", data.Issuer)
assert.Equal(t, notBefore, data.NotBefore)
assert.Equal(t, notAfter, data.NotAfter)
assert.True(t, data.ValidPair)
}) </s> remove // bad cert
data = validateCertificates("bad cert", "", "")
if !(data.WarningValidation != "" &&
!data.ValidCert &&
!data.ValidChain) {
t.Fatalf("bad cert: validateCertificates(): %v", data)
}
// bad priv key
data = validateCertificates("", "bad priv key", "")
if !(data.WarningValidation != "" &&
!data.ValidKey) {
t.Fatalf("bad priv key: validateCertificates(): %v", data)
}
</s> add "github.com/stretchr/testify/assert"
) </s> remove func createTestServer(t *testing.T, filterConf *dnsfilter.Config, forwardConf ServerConfig) *Server {
rules := `||nxdomain.example.org
||null.example.org^
127.0.0.1 host.example.org
@@||whitelist.example.org^
||127.0.0.255`
filters := []dnsfilter.Filter{{
ID: 0, Data: []byte(rules),
}}
f := dnsfilter.New(filterConf, filters)
s := NewServer(DNSCreateParams{DNSFilter: f})
s.conf = forwardConf
assert.Nil(t, s.Prepare(nil))
return s
}
func createServerTLSConfig(t *testing.T) (*tls.Config, []byte, []byte) {
t.Helper()
privateKey, err := rsa.GenerateKey(rand.Reader, 2048)
assert.Nilf(t, err, "cannot generate RSA key: %s", err)
serialNumberLimit := new(big.Int).Lsh(big.NewInt(1), 128)
serialNumber, err := rand.Int(rand.Reader, serialNumberLimit)
assert.Nilf(t, err, "failed to generate serial number: %s", err)
notBefore := time.Now()
notAfter := notBefore.Add(5 * 365 * time.Hour * 24)
template := x509.Certificate{
SerialNumber: serialNumber,
Subject: pkix.Name{
Organization: []string{"AdGuard Tests"},
},
NotBefore: notBefore,
NotAfter: notAfter,
KeyUsage: x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign,
ExtKeyUsage: []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth},
BasicConstraintsValid: true,
IsCA: true,
}
template.DNSNames = append(template.DNSNames, tlsServerName)
derBytes, err := x509.CreateCertificate(rand.Reader, &template, &template, publicKey(privateKey), privateKey)
assert.Nilf(t, err, "failed to create certificate: %s", err)
certPem := pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: derBytes})
keyPem := pem.EncodeToMemory(&pem.Block{Type: "RSA PRIVATE KEY", Bytes: x509.MarshalPKCS1PrivateKey(privateKey)})
cert, err := tls.X509KeyPair(certPem, keyPem)
assert.Nilf(t, err, "failed to create certificate: %s", err)
return &tls.Config{
Certificates: []tls.Certificate{cert},
ServerName: tlsServerName,
MinVersion: tls.VersionTLS12,
}, certPem, keyPem
}
// sendTestMessagesAsync sends messages in parallel to check for race issues.
//lint:ignore U1000 it's called from the function which is skipped for now.
func sendTestMessagesAsync(t *testing.T, conn *dns.Conn) {
wg := &sync.WaitGroup{}
for i := 0; i < testMessagesCount; i++ {
msg := createGoogleATestMessage()
wg.Add(1)
go func() {
defer wg.Done()
err := conn.WriteMsg(msg)
assert.Nilf(t, err, "cannot write message: %s", err)
res, err := conn.ReadMsg()
assert.Nilf(t, err, "cannot read response to message: %s", err)
assertGoogleAResponse(t, res)
}()
}
wg.Wait()
}
func sendTestMessages(t *testing.T, conn *dns.Conn) {
t.Helper()
for i := 0; i < testMessagesCount; i++ {
req := createGoogleATestMessage()
err := conn.WriteMsg(req)
assert.Nilf(t, err, "cannot write message #%d: %s", i, err)
res, err := conn.ReadMsg()
assert.Nilf(t, err, "cannot read response to message #%d: %s", i, err)
assertGoogleAResponse(t, res)
}
}
func createGoogleATestMessage() *dns.Msg {
return createTestMessage("google-public-dns-a.google.com.")
}
func createTestMessage(host string) *dns.Msg {
return &dns.Msg{
MsgHdr: dns.MsgHdr{
Id: dns.Id(),
RecursionDesired: true,
},
Question: []dns.Question{{
Name: host,
Qtype: dns.TypeA,
Qclass: dns.ClassINET,
}},
}
}
func createTestMessageWithType(host string, qtype uint16) *dns.Msg {
req := createTestMessage(host)
req.Question[0].Qtype = qtype
return req
}
func assertGoogleAResponse(t *testing.T, reply *dns.Msg) {
assertResponse(t, reply, net.IP{8, 8, 8, 8})
}
func assertResponse(t *testing.T, reply *dns.Msg, ip net.IP) {
t.Helper()
if !assert.Lenf(t, reply.Answer, 1, "dns server returned reply with wrong number of answers - %d", len(reply.Answer)) {
return
}
a, ok := reply.Answer[0].(*dns.A)
if assert.Truef(t, ok, "dns server returned wrong answer type instead of A: %v", reply.Answer[0]) {
assert.Truef(t, a.A.Equal(ip), "dns server returned wrong answer instead of %s: %s", ip, a.A)
}
}
</s> add </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/home/control_test.go |
)
func TestValidateCertificates(t *testing.T) {
t.Run("bad_certificate", func(t *testing.T) {
data := validateCertificates("bad cert", "", "")
assert.NotEmpty(t, data.WarningValidation)
assert.False(t, data.ValidCert)
assert.False(t, data.ValidChain)
})
t.Run("bad_private_key", func(t *testing.T) {
data := validateCertificates("", "bad priv key", "")
assert.NotEmpty(t, data.WarningValidation)
assert.False(t, data.ValidKey)
})
t.Run("valid", func(t *testing.T) {
data := validateCertificates(CertificateChain, PrivateKey, "")
notBefore, _ := time.Parse(time.RFC3339, "2019-02-27T09:24:23Z")
notAfter, _ := time.Parse(time.RFC3339, "2046-07-14T09:24:23Z")
assert.NotEmpty(t, data.WarningValidation)
assert.True(t, data.ValidCert)
assert.False(t, data.ValidChain)
assert.True(t, data.ValidKey)
assert.Equal(t, "RSA", data.KeyType)
assert.Equal(t, "CN=AdGuard Home,O=AdGuard Ltd", data.Subject)
assert.Equal(t, "CN=AdGuard Home,O=AdGuard Ltd", data.Issuer)
assert.Equal(t, notBefore, data.NotBefore)
assert.Equal(t, notAfter, data.NotAfter)
assert.True(t, data.ValidPair)
}) | <mask> O5EX70gpeGQMPDK0QSWpaazg956njJSDbNCFM4BccrdQbJu1cW4qOsfBAkAMgZuG
<mask> O88slmgTRHX4JGFmy3rrLiHNI2BbJSuJ++Yllz8beVzh6NfvuY+HKRCmPqoBPATU
<mask> kXS9jgARhhiWXJrk
<mask> -----END PRIVATE KEY-----`
<mask> data = validateCertificates(CertificateChain, PrivateKey, "")
<mask> notBefore, _ := time.Parse(time.RFC3339, "2019-02-27T09:24:23Z")
<mask> notAfter, _ := time.Parse(time.RFC3339, "2046-07-14T09:24:23Z")
<mask> if !(data.WarningValidation != "" /* self signed */ &&
<mask> data.ValidCert &&
<mask> !data.ValidChain &&
<mask> data.ValidKey &&
<mask> data.KeyType == "RSA" &&
<mask> data.Subject == "CN=AdGuard Home,O=AdGuard Ltd" &&
<mask> data.Issuer == "CN=AdGuard Home,O=AdGuard Ltd" &&
<mask> data.NotBefore.Equal(notBefore) &&
<mask> data.NotAfter.Equal(notAfter) &&
<mask> // data.DNSNames[0] == &&
<mask> data.ValidPair) {
<mask> t.Fatalf("valid cert & priv key: validateCertificates(): %v", data)
<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 // bad cert
data = validateCertificates("bad cert", "", "")
if !(data.WarningValidation != "" &&
!data.ValidCert &&
!data.ValidChain) {
t.Fatalf("bad cert: validateCertificates(): %v", data)
}
// bad priv key
data = validateCertificates("", "bad priv key", "")
if !(data.WarningValidation != "" &&
!data.ValidKey) {
t.Fatalf("bad priv key: validateCertificates(): %v", data)
}
</s> add "github.com/stretchr/testify/assert"
) </s> remove )
/* Tests performed:
. Bad certificate
. Bad private key
. Valid certificate & private key */
func TestValidateCertificates(t *testing.T) {
var data tlsConfigStatus
</s> add </s> remove if assert.Len(t, h.WhoisInfo, 2) && assert.Len(t, h.WhoisInfo[0], 2) {
assert.Equal(t, "orgname-val", h.WhoisInfo[0][1])
}
}
</s> add </s> remove if assert.Len(t, h.WhoisInfo, 2) && assert.Len(t, h.WhoisInfo[0], 2) {
assert.Equal(t, "orgname-val", h.WhoisInfo[0][1])
}
}
</s> add </s> remove // set whois info on new client
clients.SetWhoisInfo("1.1.1.255", whois)
if assert.NotNil(t, clients.ipHost["1.1.1.255"]) {
</s> add t.Run("new_client", func(t *testing.T) {
clients.SetWhoisInfo("1.1.1.255", whois)
require.NotNil(t, clients.ipHost["1.1.1.255"]) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/control_test.go |
"github.com/stretchr/testify/require" | <mask> "time"
<mask>
<mask> "github.com/stretchr/testify/assert"
<mask> )
<mask>
<mask> func testStartFilterListener(t *testing.T) net.Listener {
<mask> t.Helper()
</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 testStartFilterListener() net.Listener {
</s> add func testStartFilterListener(t *testing.T) net.Listener {
t.Helper()
const content = `||example.org^$third-party
# Inline comment example
||example.com^$third-party
0.0.0.0 example.com
`
</s> remove "os"
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/filter_test.go |
func testStartFilterListener(t *testing.T) net.Listener {
t.Helper()
const content = `||example.org^$third-party
# Inline comment example
||example.com^$third-party
0.0.0.0 example.com
`
| <mask>
<mask> "github.com/stretchr/testify/assert"
<mask> )
<mask>
<mask> func testStartFilterListener() net.Listener {
<mask> mux := http.NewServeMux()
<mask> mux.HandleFunc("/filters/1.txt", func(w http.ResponseWriter, r *http.Request) {
<mask> content := `||example.org^$third-party
<mask> # Inline comment example
<mask> ||example.com^$third-party
</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 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 makeHandler := func(err *error) http.HandlerFunc {
</s> add makeHandler := func(t *testing.T, err *error) http.HandlerFunc {
t.Helper()
</s> remove if werr != nil {
panic(werr)
}
</s> add require.Nil(t, werr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/filter_test.go |
_, werr := w.Write([]byte(content))
assert.Nil(t, werr) | <mask>
<mask> func testStartFilterListener() net.Listener {
<mask> mux := http.NewServeMux()
<mask> mux.HandleFunc("/filters/1.txt", func(w http.ResponseWriter, r *http.Request) {
<mask> content := `||example.org^$third-party
<mask> # Inline comment example
<mask> ||example.com^$third-party
<mask> 0.0.0.0 example.com
<mask> `
<mask> _, _ = w.Write([]byte(content))
<mask> })
<mask>
<mask> listener, err := net.Listen("tcp", ":0")
<mask> if err != nil {
<mask> panic(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 func testStartFilterListener() net.Listener {
</s> add func testStartFilterListener(t *testing.T) net.Listener {
t.Helper()
const content = `||example.org^$third-party
# Inline comment example
||example.com^$third-party
0.0.0.0 example.com
`
</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 go func() { _ = http.Serve(listener, mux) }()
</s> add </s> remove makeHandler := func(err *error) http.HandlerFunc {
</s> add makeHandler := func(t *testing.T, err *error) http.HandlerFunc {
t.Helper()
</s> remove if werr != nil {
panic(werr)
}
</s> add require.Nil(t, werr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/filter_test.go |
require.Nil(t, err)
go func() {
_ = http.Serve(listener, mux)
}()
t.Cleanup(func() {
assert.Nil(t, listener.Close())
}) | <mask> _, _ = w.Write([]byte(content))
<mask> })
<mask>
<mask> listener, err := net.Listen("tcp", ":0")
<mask> if err != nil {
<mask> panic(err)
<mask> }
<mask>
<mask> go func() { _ = http.Serve(listener, mux) }()
<mask> return listener
<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 go func() { _ = http.Serve(listener, mux) }()
</s> add </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 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 if err != nil {
t.Fatal(err.Error())
}
</s> add require.Nil(t, err)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/filter_test.go |
<mask> if err != nil {
<mask> panic(err)
<mask> }
<mask>
<mask> go func() { _ = http.Serve(listener, mux) }()
<mask> return listener
<mask> }
<mask>
<mask> func TestFilters(t *testing.T) {
<mask> l := testStartFilterListener()
</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 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 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 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 dir := prepareTestDir()
defer func() { _ = os.RemoveAll(dir) }()
</s> add dir := prepareTestDir(t) </s> remove if err != nil {
t.Fatal(err.Error())
}
</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/filter_test.go | |
l := testStartFilterListener(t)
dir := prepareTestDir(t)
Context = homeContext{
workDir: dir,
client: &http.Client{
Timeout: 5 * time.Second,
}, | <mask> return listener
<mask> }
<mask>
<mask> func TestFilters(t *testing.T) {
<mask> l := testStartFilterListener()
<mask> defer func() { _ = l.Close() }()
<mask>
<mask> dir := prepareTestDir()
<mask> defer func() { _ = os.RemoveAll(dir) }()
<mask> Context = homeContext{}
<mask> Context.workDir = dir
<mask> Context.client = &http.Client{
<mask> Timeout: 5 * time.Second,
<mask> }
<mask> Context.filters.Init()
<mask>
<mask> f := filter{
<mask> URL: fmt.Sprintf("http://127.0.0.1:%d/filters/1.txt", l.Addr().(*net.TCPAddr).Port),
</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 go func() { _ = http.Serve(listener, mux) }()
</s> add </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())
}) | [
"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/home/filter_test.go |
// Download. | <mask> f := filter{
<mask> URL: fmt.Sprintf("http://127.0.0.1:%d/filters/1.txt", l.Addr().(*net.TCPAddr).Port),
<mask> }
<mask>
<mask> // download
<mask> ok, err := Context.filters.update(&f)
<mask> assert.Nil(t, err)
<mask> assert.True(t, ok)
<mask> assert.Equal(t, 3, f.RulesCount)
<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)
assert.True(t, ok)
</s> add require.Nil(t, err)
require.True(t, ok) </s> remove // refresh
</s> add // Refresh. </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 assert.False(t, ok)
assert.Nil(t, err)
</s> add require.Nil(t, err)
require.False(t, ok) </s> remove }
ok, err := clients.Add(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/filter_test.go |
require.Nil(t, err)
require.True(t, ok) | <mask> }
<mask>
<mask> // download
<mask> ok, err := Context.filters.update(&f)
<mask> assert.Nil(t, err)
<mask> assert.True(t, ok)
<mask> assert.Equal(t, 3, f.RulesCount)
<mask>
<mask> // refresh
<mask> ok, err = Context.filters.update(&f)
<mask> assert.False(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 // refresh
</s> add // Refresh. </s> remove assert.False(t, ok)
assert.Nil(t, err)
</s> add require.Nil(t, err)
require.False(t, ok) </s> remove // download
</s> add // Download. </s> remove ok, err := clients.Add(c)
assert.True(t, ok)
assert.Nil(t, err)
</s> add clients.Init(nil, nil, nil) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/filter_test.go |
// Refresh. | <mask> assert.Nil(t, err)
<mask> assert.True(t, ok)
<mask> assert.Equal(t, 3, f.RulesCount)
<mask>
<mask> // refresh
<mask> ok, err = Context.filters.update(&f)
<mask> assert.False(t, ok)
<mask> assert.Nil(t, err)
<mask>
<mask> err = Context.filters.load(&f)
</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.False(t, ok)
assert.Nil(t, err)
</s> add require.Nil(t, err)
require.False(t, ok) </s> remove assert.Nil(t, err)
assert.True(t, ok)
</s> add require.Nil(t, err)
require.True(t, ok) </s> remove // download
</s> add // Download. </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/home/filter_test.go |
require.Nil(t, err)
require.False(t, ok) | <mask> assert.Equal(t, 3, f.RulesCount)
<mask>
<mask> // refresh
<mask> ok, err = Context.filters.update(&f)
<mask> assert.False(t, ok)
<mask> assert.Nil(t, err)
<mask>
<mask> err = Context.filters.load(&f)
<mask> assert.Nil(t, err)
<mask>
<mask> f.unload()
</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 // refresh
</s> add // Refresh. </s> remove assert.Nil(t, err)
assert.True(t, ok)
</s> add require.Nil(t, err)
require.True(t, ok) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove // download
</s> add // Download. </s> remove _ = os.Remove(f.Path())
</s> add require.Nil(t, os.Remove(f.Path())) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/filter_test.go |
require.Nil(t, err) | <mask> assert.False(t, ok)
<mask> assert.Nil(t, err)
<mask>
<mask> err = Context.filters.load(&f)
<mask> assert.Nil(t, err)
<mask>
<mask> f.unload()
<mask> _ = os.Remove(f.Path())
<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.Remove(f.Path())
</s> add require.Nil(t, os.Remove(f.Path())) </s> remove assert.False(t, ok)
assert.Nil(t, err)
</s> add require.Nil(t, err)
require.False(t, ok) </s> remove // refresh
</s> add // Refresh. </s> remove assert.Nil(t, err)
assert.True(t, ok)
</s> add require.Nil(t, err)
require.True(t, ok) </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())
}) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/filter_test.go |
require.Nil(t, os.Remove(f.Path())) | <mask> err = Context.filters.load(&f)
<mask> assert.Nil(t, err)
<mask>
<mask> f.unload()
<mask> _ = os.Remove(f.Path())
<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.False(t, ok)
assert.Nil(t, err)
</s> add require.Nil(t, err)
require.False(t, ok) </s> remove // refresh
</s> add // Refresh. </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 if assert.Nil(t, err) {
t.Cleanup(func() {
assert.Nil(t, hf.Close())
assert.Nil(t, os.Remove(hf.Name()))
})
}
</s> add require.Nil(t, err)
t.Cleanup(func() {
assert.Nil(t, hf.Close())
assert.Nil(t, os.Remove(hf.Name()))
}) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/filter_test.go |
dir := prepareTestDir(t) | <mask> func TestHome(t *testing.T) {
<mask> // Init new context
<mask> Context = homeContext{}
<mask>
<mask> dir := prepareTestDir()
<mask> defer func() { _ = os.RemoveAll(dir) }()
<mask> fn := filepath.Join(dir, "AdGuardHome.yaml")
<mask>
<mask> // Prepare the test config
<mask> assert.Nil(t, ioutil.WriteFile(fn, []byte(yamlConf), 0o644))
<mask> fn, _ = filepath.Abs(fn)
</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 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) </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/home_test.go |
makeHandler := func(t *testing.T, err *error) http.HandlerFunc {
t.Helper()
| <mask> want: []byte(nil),
<mask> wantErr: nil,
<mask> }}
<mask>
<mask> makeHandler := func(err *error) http.HandlerFunc {
<mask> return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
<mask> var b []byte
<mask> b, *err = ioutil.ReadAll(r.Body)
<mask> _, werr := w.Write(b)
<mask> if werr != nil {
</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 werr != nil {
panic(werr)
}
</s> add require.Nil(t, werr) </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 testStartFilterListener() net.Listener {
</s> add func testStartFilterListener(t *testing.T) net.Listener {
t.Helper()
const content = `||example.org^$third-party
# Inline comment example
||example.com^$third-party
0.0.0.0 example.com
`
</s> remove // match domain
r := d.processRewrites("host.com", dns.TypeA)
assert.Equal(t, Rewritten, r.Reason)
assert.Len(t, r.IPList, 1)
assert.True(t, net.IP{1, 2, 3, 4}.Equal(r.IPList[0]))
// match exception
r = d.processRewrites("host.com", dns.TypeAAAA)
assert.Equal(t, NotFilteredNotFound, r.Reason)
// match exception
r = d.processRewrites("host2.com", dns.TypeA)
assert.Equal(t, NotFilteredNotFound, r.Reason)
// match domain
r = d.processRewrites("host2.com", dns.TypeAAAA)
assert.Equal(t, Rewritten, r.Reason)
assert.Len(t, r.IPList, 1)
assert.Equal(t, "::1", r.IPList[0].String())
// match exception
r = d.processRewrites("host3.com", dns.TypeA)
assert.Equal(t, NotFilteredNotFound, r.Reason)
// match domain
r = d.processRewrites("host3.com", dns.TypeAAAA)
assert.Equal(t, Rewritten, r.Reason)
assert.Empty(t, r.IPList)
</s> add testCases := []struct {
name string
host string
dtyp uint16
want []net.IP
}{{
name: "match_A",
host: "host.com",
dtyp: dns.TypeA,
want: []net.IP{{1, 2, 3, 4}},
}, {
name: "exception_AAAA_host.com",
host: "host.com",
dtyp: dns.TypeAAAA,
}, {
name: "exception_A_host2.com",
host: "host2.com",
dtyp: dns.TypeA,
}, {
name: "match_AAAA_host2.com",
host: "host2.com",
dtyp: dns.TypeAAAA,
want: []net.IP{net.ParseIP("::1")},
}, {
name: "exception_A_host3.com",
host: "host3.com",
dtyp: dns.TypeA,
}, {
name: "match_AAAA_host3.com",
host: "host3.com",
dtyp: dns.TypeAAAA,
want: []net.IP{},
}}
for _, tc := range testCases {
t.Run(tc.name+"_"+tc.host, func(t *testing.T) {
r := d.processRewrites(tc.host, tc.dtyp)
if tc.want == nil {
assert.Equal(t, NotFilteredNotFound, r.Reason)
return
}
assert.Equal(t, Rewritten, r.Reason)
require.Len(t, r.IPList, len(tc.want))
for _, ip := range tc.want {
assert.True(t, ip.Equal(r.IPList[0]))
}
})
} </s> remove go func() { _ = http.Serve(listener, mux) }()
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/middlewares_test.go |
require.Nil(t, werr) | <mask> return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
<mask> var b []byte
<mask> b, *err = ioutil.ReadAll(r.Body)
<mask> _, werr := w.Write(b)
<mask> if werr != nil {
<mask> panic(werr)
<mask> }
<mask> })
<mask> }
<mask>
<mask> for _, tc := range testCases {
<mask> t.Run(tc.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 makeHandler := func(err *error) http.HandlerFunc {
</s> add makeHandler := func(t *testing.T, err *error) http.HandlerFunc {
t.Helper()
</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 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.Equal(t, tc.want, w.Body.String())
</s> add </s> remove assert.Nil(t, err)
if tc.name == "first" {
assert.True(t, true)
}
</s> add require.Nil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/middlewares_test.go |
handler := makeHandler(t, &err) | <mask>
<mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> var err error
<mask> handler := makeHandler(&err)
<mask> lim := limitRequestBody(handler)
<mask>
<mask> req := httptest.NewRequest(http.MethodPost, "https://www.example.com", strings.NewReader(tc.body))
<mask> res := 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 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)
</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/home/middlewares_test.go |
assert.Equal(t, tc.wantErr, err) | <mask> res := httptest.NewRecorder()
<mask>
<mask> lim.ServeHTTP(res, req)
<mask>
<mask> require.Equal(t, tc.wantErr, err)
<mask> assert.Equal(t, tc.want, res.Body.Bytes())
<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)
</s> add require.Nil(t, err) </s> remove w.Body.Reset()
</s> add </s> remove assert.Equal(t, http.StatusOK, w.Code)
</s> add require.Equal(t, http.StatusOK, w.Code) </s> remove assert.Equal(t, http.StatusOK, w.Code)
</s> add require.Equal(t, http.StatusOK, w.Code) </s> remove assert.Equal(t, http.StatusOK, w.Code)
</s> add require.Equal(t, http.StatusOK, w.Code) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/middlewares_test.go |
"github.com/stretchr/testify/require" | <mask> "testing"
<mask>
<mask> "github.com/stretchr/testify/assert"
<mask> "howett.net/plist"
<mask> )
<mask>
<mask> func TestHandleMobileConfigDOH(t *testing.T) {
<mask> t.Run("success", 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 "os"
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/mobileconfig_test.go |
require.Nil(t, err) | <mask>
<mask> func TestHandleMobileConfigDOH(t *testing.T) {
<mask> t.Run("success", func(t *testing.T) {
<mask> r, err := http.NewRequest(http.MethodGet, "https://example.com:12345/apple/doh.mobileconfig?host=example.org", nil)
<mask> assert.Nil(t, err)
<mask>
<mask> w := httptest.NewRecorder()
<mask>
<mask> handleMobileConfigDOH(w, r)
<mask> assert.Equal(t, http.StatusOK, w.Code)
</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/home/mobileconfig_test.go |
require.Equal(t, http.StatusOK, w.Code) | <mask>
<mask> w := httptest.NewRecorder()
<mask>
<mask> handleMobileConfigDOH(w, r)
<mask> assert.Equal(t, http.StatusOK, w.Code)
<mask>
<mask> var mc mobileConfig
<mask> _, err = plist.Unmarshal(w.Body.Bytes(), &mc)
<mask> assert.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.Equal(t, http.StatusOK, w.Code)
</s> add require.Equal(t, http.StatusOK, w.Code) </s> remove assert.Equal(t, http.StatusOK, w.Code)
</s> add require.Equal(t, http.StatusOK, w.Code) </s> remove assert.Equal(t, http.StatusOK, w.Code)
</s> add require.Equal(t, http.StatusOK, w.Code) </s> remove assert.Equal(t, http.StatusOK, w.Code)
</s> add require.Equal(t, http.StatusOK, w.Code) </s> remove assert.Equal(t, http.StatusOK, w.Code)
</s> add require.Equal(t, http.StatusOK, w.Code) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/mobileconfig_test.go |
require.Nil(t, err) | <mask> assert.Equal(t, http.StatusOK, w.Code)
<mask>
<mask> var mc mobileConfig
<mask> _, err = plist.Unmarshal(w.Body.Bytes(), &mc)
<mask> assert.Nil(t, err)
<mask>
<mask> if assert.Len(t, mc.PayloadContent, 1) {
<mask> assert.Equal(t, "example.org DoH", mc.PayloadContent[0].Name)
<mask> assert.Equal(t, "example.org DoH", mc.PayloadContent[0].PayloadDisplayName)
<mask> assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
</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, mc.PayloadContent, 1) {
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
assert.Equal(t, "https://example.org/dns-query/cli42", mc.PayloadContent[0].DNSSettings.ServerURL)
}
</s> add require.Len(t, mc.PayloadContent, 1)
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
assert.Equal(t, "https://example.org/dns-query/cli42", mc.PayloadContent[0].DNSSettings.ServerURL) </s> remove if assert.Len(t, mc.PayloadContent, 1) {
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
assert.Equal(t, "https://example.org/dns-query", mc.PayloadContent[0].DNSSettings.ServerURL)
}
</s> add require.Len(t, mc.PayloadContent, 1)
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
assert.Equal(t, "https://example.org/dns-query", mc.PayloadContent[0].DNSSettings.ServerURL) </s> remove if assert.Len(t, mc.PayloadContent, 1) {
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
assert.Equal(t, "https://example.org/dns-query", mc.PayloadContent[0].DNSSettings.ServerURL)
}
</s> add require.Len(t, mc.PayloadContent, 1)
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
assert.Equal(t, "https://example.org/dns-query", mc.PayloadContent[0].DNSSettings.ServerURL) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/mobileconfig_test.go |
require.Len(t, mc.PayloadContent, 1)
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
assert.Equal(t, "https://example.org/dns-query", mc.PayloadContent[0].DNSSettings.ServerURL) | <mask> var mc mobileConfig
<mask> _, err = plist.Unmarshal(w.Body.Bytes(), &mc)
<mask> assert.Nil(t, err)
<mask>
<mask> if assert.Len(t, mc.PayloadContent, 1) {
<mask> assert.Equal(t, "example.org DoH", mc.PayloadContent[0].Name)
<mask> assert.Equal(t, "example.org DoH", mc.PayloadContent[0].PayloadDisplayName)
<mask> assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
<mask> assert.Equal(t, "https://example.org/dns-query", mc.PayloadContent[0].DNSSettings.ServerURL)
<mask> }
<mask> })
<mask>
<mask> t.Run("success_no_host", func(t *testing.T) {
<mask> oldTLSConf := Context.tls
<mask> t.Cleanup(func() { Context.tls = oldTLSConf })
</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, mc.PayloadContent, 1) {
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
assert.Equal(t, "https://example.org/dns-query", mc.PayloadContent[0].DNSSettings.ServerURL)
}
</s> add require.Len(t, mc.PayloadContent, 1)
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
assert.Equal(t, "https://example.org/dns-query", mc.PayloadContent[0].DNSSettings.ServerURL) </s> remove if assert.Len(t, mc.PayloadContent, 1) {
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
}
</s> add require.Len(t, mc.PayloadContent, 1)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName) </s> remove if assert.Len(t, mc.PayloadContent, 1) {
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
}
</s> add require.Len(t, mc.PayloadContent, 1)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName) </s> remove if assert.Len(t, mc.PayloadContent, 1) {
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
assert.Equal(t, "https://example.org/dns-query/cli42", mc.PayloadContent[0].DNSSettings.ServerURL)
}
</s> add require.Len(t, mc.PayloadContent, 1)
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
assert.Equal(t, "https://example.org/dns-query/cli42", mc.PayloadContent[0].DNSSettings.ServerURL) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/mobileconfig_test.go |
require.Nil(t, err) | <mask> conf: tlsConfigSettings{ServerName: "example.org"},
<mask> }
<mask>
<mask> r, err := http.NewRequest(http.MethodGet, "https://example.com:12345/apple/doh.mobileconfig", nil)
<mask> assert.Nil(t, err)
<mask>
<mask> w := httptest.NewRecorder()
<mask>
<mask> handleMobileConfigDOH(w, r)
<mask> assert.Equal(t, http.StatusOK, w.Code)
</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/home/mobileconfig_test.go |
require.Equal(t, http.StatusOK, w.Code) | <mask>
<mask> w := httptest.NewRecorder()
<mask>
<mask> handleMobileConfigDOH(w, r)
<mask> assert.Equal(t, http.StatusOK, w.Code)
<mask>
<mask> var mc mobileConfig
<mask> _, err = plist.Unmarshal(w.Body.Bytes(), &mc)
<mask> assert.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 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/mobileconfig_test.go |
require.Nil(t, err) | <mask> assert.Equal(t, http.StatusOK, w.Code)
<mask>
<mask> var mc mobileConfig
<mask> _, err = plist.Unmarshal(w.Body.Bytes(), &mc)
<mask> assert.Nil(t, err)
<mask>
<mask> if assert.Len(t, mc.PayloadContent, 1) {
<mask> assert.Equal(t, "example.org DoH", mc.PayloadContent[0].Name)
<mask> assert.Equal(t, "example.org DoH", mc.PayloadContent[0].PayloadDisplayName)
<mask> assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
</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 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/mobileconfig_test.go |
require.Len(t, mc.PayloadContent, 1)
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
assert.Equal(t, "https://example.org/dns-query", mc.PayloadContent[0].DNSSettings.ServerURL) | <mask> var mc mobileConfig
<mask> _, err = plist.Unmarshal(w.Body.Bytes(), &mc)
<mask> assert.Nil(t, err)
<mask>
<mask> if assert.Len(t, mc.PayloadContent, 1) {
<mask> assert.Equal(t, "example.org DoH", mc.PayloadContent[0].Name)
<mask> assert.Equal(t, "example.org DoH", mc.PayloadContent[0].PayloadDisplayName)
<mask> assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
<mask> assert.Equal(t, "https://example.org/dns-query", mc.PayloadContent[0].DNSSettings.ServerURL)
<mask> }
<mask> })
<mask>
<mask> t.Run("error_no_host", func(t *testing.T) {
<mask> oldTLSConf := Context.tls
<mask> t.Cleanup(func() { Context.tls = oldTLSConf })
</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, mc.PayloadContent, 1) {
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
assert.Equal(t, "https://example.org/dns-query", mc.PayloadContent[0].DNSSettings.ServerURL)
}
</s> add require.Len(t, mc.PayloadContent, 1)
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
assert.Equal(t, "https://example.org/dns-query", mc.PayloadContent[0].DNSSettings.ServerURL) </s> remove if assert.Len(t, mc.PayloadContent, 1) {
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
}
</s> add require.Len(t, mc.PayloadContent, 1)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName) </s> remove if assert.Len(t, mc.PayloadContent, 1) {
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
}
</s> add require.Len(t, mc.PayloadContent, 1)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName) </s> remove if assert.Len(t, mc.PayloadContent, 1) {
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
assert.Equal(t, "https://example.org/dns-query/cli42", mc.PayloadContent[0].DNSSettings.ServerURL)
}
</s> add require.Len(t, mc.PayloadContent, 1)
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
assert.Equal(t, "https://example.org/dns-query/cli42", mc.PayloadContent[0].DNSSettings.ServerURL) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/mobileconfig_test.go |
require.Nil(t, err) | <mask>
<mask> Context.tls = &TLSMod{conf: tlsConfigSettings{}}
<mask>
<mask> r, err := http.NewRequest(http.MethodGet, "https://example.com:12345/apple/doh.mobileconfig", nil)
<mask> assert.Nil(t, err)
<mask>
<mask> w := httptest.NewRecorder()
<mask>
<mask> handleMobileConfigDOH(w, r)
<mask> assert.Equal(t, http.StatusInternalServerError, w.Code)
</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/home/mobileconfig_test.go |
require.Nil(t, err) | <mask> })
<mask>
<mask> t.Run("client_id", func(t *testing.T) {
<mask> r, err := http.NewRequest(http.MethodGet, "https://example.com:12345/apple/doh.mobileconfig?host=example.org&client_id=cli42", nil)
<mask> assert.Nil(t, err)
<mask>
<mask> w := httptest.NewRecorder()
<mask>
<mask> handleMobileConfigDOH(w, r)
<mask> assert.Equal(t, http.StatusOK, w.Code)
</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/home/mobileconfig_test.go |
require.Equal(t, http.StatusOK, w.Code) | <mask>
<mask> w := httptest.NewRecorder()
<mask>
<mask> handleMobileConfigDOH(w, r)
<mask> assert.Equal(t, http.StatusOK, w.Code)
<mask>
<mask> var mc mobileConfig
<mask> _, err = plist.Unmarshal(w.Body.Bytes(), &mc)
<mask> assert.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 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/mobileconfig_test.go |
require.Nil(t, err) | <mask> assert.Equal(t, http.StatusOK, w.Code)
<mask>
<mask> var mc mobileConfig
<mask> _, err = plist.Unmarshal(w.Body.Bytes(), &mc)
<mask> assert.Nil(t, err)
<mask>
<mask> if assert.Len(t, mc.PayloadContent, 1) {
<mask> assert.Equal(t, "example.org DoH", mc.PayloadContent[0].Name)
<mask> assert.Equal(t, "example.org DoH", mc.PayloadContent[0].PayloadDisplayName)
<mask> assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
</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 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/mobileconfig_test.go |
require.Len(t, mc.PayloadContent, 1)
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
assert.Equal(t, "https://example.org/dns-query/cli42", mc.PayloadContent[0].DNSSettings.ServerURL) | <mask> var mc mobileConfig
<mask> _, err = plist.Unmarshal(w.Body.Bytes(), &mc)
<mask> assert.Nil(t, err)
<mask>
<mask> if assert.Len(t, mc.PayloadContent, 1) {
<mask> assert.Equal(t, "example.org DoH", mc.PayloadContent[0].Name)
<mask> assert.Equal(t, "example.org DoH", mc.PayloadContent[0].PayloadDisplayName)
<mask> assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
<mask> assert.Equal(t, "https://example.org/dns-query/cli42", mc.PayloadContent[0].DNSSettings.ServerURL)
<mask> }
<mask> })
<mask> }
<mask>
<mask> func TestHandleMobileConfigDOT(t *testing.T) {
<mask> t.Run("success", 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 if assert.Len(t, mc.PayloadContent, 1) {
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
assert.Equal(t, "https://example.org/dns-query", mc.PayloadContent[0].DNSSettings.ServerURL)
}
</s> add require.Len(t, mc.PayloadContent, 1)
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
assert.Equal(t, "https://example.org/dns-query", mc.PayloadContent[0].DNSSettings.ServerURL) </s> remove if assert.Len(t, mc.PayloadContent, 1) {
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
assert.Equal(t, "https://example.org/dns-query", mc.PayloadContent[0].DNSSettings.ServerURL)
}
</s> add require.Len(t, mc.PayloadContent, 1)
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
assert.Equal(t, "https://example.org/dns-query", mc.PayloadContent[0].DNSSettings.ServerURL) </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",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/mobileconfig_test.go |
require.Nil(t, err) | <mask>
<mask> func TestHandleMobileConfigDOT(t *testing.T) {
<mask> t.Run("success", func(t *testing.T) {
<mask> r, err := http.NewRequest(http.MethodGet, "https://example.com:12345/apple/dot.mobileconfig?host=example.org", nil)
<mask> assert.Nil(t, err)
<mask>
<mask> w := httptest.NewRecorder()
<mask>
<mask> handleMobileConfigDOT(w, r)
<mask> assert.Equal(t, http.StatusOK, w.Code)
</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/home/mobileconfig_test.go |
require.Equal(t, http.StatusOK, w.Code) | <mask>
<mask> w := httptest.NewRecorder()
<mask>
<mask> handleMobileConfigDOT(w, r)
<mask> assert.Equal(t, http.StatusOK, w.Code)
<mask>
<mask> var mc mobileConfig
<mask> _, err = plist.Unmarshal(w.Body.Bytes(), &mc)
<mask> assert.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.Equal(t, http.StatusOK, w.Code)
</s> add require.Equal(t, http.StatusOK, w.Code) </s> remove assert.Equal(t, http.StatusOK, w.Code)
</s> add require.Equal(t, http.StatusOK, w.Code) </s> remove assert.Equal(t, http.StatusOK, w.Code)
</s> add require.Equal(t, http.StatusOK, w.Code) </s> remove assert.Equal(t, http.StatusOK, w.Code)
</s> add require.Equal(t, http.StatusOK, w.Code) </s> remove assert.Equal(t, http.StatusOK, w.Code)
</s> add require.Equal(t, http.StatusOK, w.Code) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/mobileconfig_test.go |
require.Nil(t, err) | <mask> assert.Equal(t, http.StatusOK, w.Code)
<mask>
<mask> var mc mobileConfig
<mask> _, err = plist.Unmarshal(w.Body.Bytes(), &mc)
<mask> assert.Nil(t, err)
<mask>
<mask> if assert.Len(t, mc.PayloadContent, 1) {
<mask> assert.Equal(t, "example.org DoT", mc.PayloadContent[0].Name)
<mask> assert.Equal(t, "example.org DoT", mc.PayloadContent[0].PayloadDisplayName)
<mask> assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
</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, mc.PayloadContent, 1) {
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
}
</s> add require.Len(t, mc.PayloadContent, 1)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName) </s> remove if assert.Len(t, mc.PayloadContent, 1) {
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
}
</s> add require.Len(t, mc.PayloadContent, 1)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName) </s> remove if assert.Len(t, mc.PayloadContent, 1) {
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "cli42.example.org", mc.PayloadContent[0].DNSSettings.ServerName)
}
</s> add require.Len(t, mc.PayloadContent, 1)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "cli42.example.org", mc.PayloadContent[0].DNSSettings.ServerName) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/mobileconfig_test.go |
require.Len(t, mc.PayloadContent, 1)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName) | <mask> var mc mobileConfig
<mask> _, err = plist.Unmarshal(w.Body.Bytes(), &mc)
<mask> assert.Nil(t, err)
<mask>
<mask> if assert.Len(t, mc.PayloadContent, 1) {
<mask> assert.Equal(t, "example.org DoT", mc.PayloadContent[0].Name)
<mask> assert.Equal(t, "example.org DoT", mc.PayloadContent[0].PayloadDisplayName)
<mask> assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
<mask> }
<mask> })
<mask>
<mask> t.Run("success_no_host", func(t *testing.T) {
<mask> oldTLSConf := Context.tls
<mask> t.Cleanup(func() { Context.tls = oldTLSConf })
</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, mc.PayloadContent, 1) {
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
}
</s> add require.Len(t, mc.PayloadContent, 1)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName) </s> remove if assert.Len(t, mc.PayloadContent, 1) {
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
assert.Equal(t, "https://example.org/dns-query", mc.PayloadContent[0].DNSSettings.ServerURL)
}
</s> add require.Len(t, mc.PayloadContent, 1)
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
assert.Equal(t, "https://example.org/dns-query", mc.PayloadContent[0].DNSSettings.ServerURL) </s> remove if assert.Len(t, mc.PayloadContent, 1) {
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
assert.Equal(t, "https://example.org/dns-query", mc.PayloadContent[0].DNSSettings.ServerURL)
}
</s> add require.Len(t, mc.PayloadContent, 1)
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
assert.Equal(t, "https://example.org/dns-query", mc.PayloadContent[0].DNSSettings.ServerURL) </s> remove if assert.Len(t, mc.PayloadContent, 1) {
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "cli42.example.org", mc.PayloadContent[0].DNSSettings.ServerName)
}
</s> add require.Len(t, mc.PayloadContent, 1)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "cli42.example.org", mc.PayloadContent[0].DNSSettings.ServerName) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/mobileconfig_test.go |
require.Nil(t, err) | <mask> conf: tlsConfigSettings{ServerName: "example.org"},
<mask> }
<mask>
<mask> r, err := http.NewRequest(http.MethodGet, "https://example.com:12345/apple/dot.mobileconfig", nil)
<mask> assert.Nil(t, err)
<mask>
<mask> w := httptest.NewRecorder()
<mask>
<mask> handleMobileConfigDOT(w, r)
<mask> assert.Equal(t, http.StatusOK, w.Code)
</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/home/mobileconfig_test.go |
require.Equal(t, http.StatusOK, w.Code) | <mask>
<mask> w := httptest.NewRecorder()
<mask>
<mask> handleMobileConfigDOT(w, r)
<mask> assert.Equal(t, http.StatusOK, w.Code)
<mask>
<mask> var mc mobileConfig
<mask> _, err = plist.Unmarshal(w.Body.Bytes(), &mc)
<mask> assert.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 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/mobileconfig_test.go |
require.Nil(t, err) | <mask> assert.Equal(t, http.StatusOK, w.Code)
<mask>
<mask> var mc mobileConfig
<mask> _, err = plist.Unmarshal(w.Body.Bytes(), &mc)
<mask> assert.Nil(t, err)
<mask>
<mask> if assert.Len(t, mc.PayloadContent, 1) {
<mask> assert.Equal(t, "example.org DoT", mc.PayloadContent[0].Name)
<mask> assert.Equal(t, "example.org DoT", mc.PayloadContent[0].PayloadDisplayName)
<mask> assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
</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 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/mobileconfig_test.go |
require.Len(t, mc.PayloadContent, 1)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName) | <mask> var mc mobileConfig
<mask> _, err = plist.Unmarshal(w.Body.Bytes(), &mc)
<mask> assert.Nil(t, err)
<mask>
<mask> if assert.Len(t, mc.PayloadContent, 1) {
<mask> assert.Equal(t, "example.org DoT", mc.PayloadContent[0].Name)
<mask> assert.Equal(t, "example.org DoT", mc.PayloadContent[0].PayloadDisplayName)
<mask> assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
<mask> }
<mask> })
<mask>
<mask> t.Run("error_no_host", func(t *testing.T) {
<mask> oldTLSConf := Context.tls
<mask> t.Cleanup(func() { Context.tls = oldTLSConf })
</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, mc.PayloadContent, 1) {
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
}
</s> add require.Len(t, mc.PayloadContent, 1)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName) </s> remove if assert.Len(t, mc.PayloadContent, 1) {
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
assert.Equal(t, "https://example.org/dns-query", mc.PayloadContent[0].DNSSettings.ServerURL)
}
</s> add require.Len(t, mc.PayloadContent, 1)
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
assert.Equal(t, "https://example.org/dns-query", mc.PayloadContent[0].DNSSettings.ServerURL) </s> remove if assert.Len(t, mc.PayloadContent, 1) {
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
assert.Equal(t, "https://example.org/dns-query", mc.PayloadContent[0].DNSSettings.ServerURL)
}
</s> add require.Len(t, mc.PayloadContent, 1)
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
assert.Equal(t, "https://example.org/dns-query", mc.PayloadContent[0].DNSSettings.ServerURL) </s> remove if assert.Len(t, mc.PayloadContent, 1) {
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "cli42.example.org", mc.PayloadContent[0].DNSSettings.ServerName)
}
</s> add require.Len(t, mc.PayloadContent, 1)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "cli42.example.org", mc.PayloadContent[0].DNSSettings.ServerName) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/mobileconfig_test.go |
require.Nil(t, err) | <mask>
<mask> Context.tls = &TLSMod{conf: tlsConfigSettings{}}
<mask>
<mask> r, err := http.NewRequest(http.MethodGet, "https://example.com:12345/apple/dot.mobileconfig", nil)
<mask> assert.Nil(t, err)
<mask>
<mask> w := httptest.NewRecorder()
<mask>
<mask> handleMobileConfigDOT(w, r)
<mask> assert.Equal(t, http.StatusInternalServerError, w.Code)
</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/home/mobileconfig_test.go |
require.Nil(t, err) | <mask> })
<mask>
<mask> t.Run("client_id", func(t *testing.T) {
<mask> r, err := http.NewRequest(http.MethodGet, "https://example.com:12345/apple/dot.mobileconfig?host=example.org&client_id=cli42", nil)
<mask> assert.Nil(t, err)
<mask>
<mask> w := httptest.NewRecorder()
<mask>
<mask> handleMobileConfigDOT(w, r)
<mask> assert.Equal(t, http.StatusOK, w.Code)
</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/home/mobileconfig_test.go |
require.Equal(t, http.StatusOK, w.Code) | <mask>
<mask> w := httptest.NewRecorder()
<mask>
<mask> handleMobileConfigDOT(w, r)
<mask> assert.Equal(t, http.StatusOK, w.Code)
<mask>
<mask> var mc mobileConfig
<mask> _, err = plist.Unmarshal(w.Body.Bytes(), &mc)
<mask> assert.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 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/mobileconfig_test.go |
require.Nil(t, err) | <mask> assert.Equal(t, http.StatusOK, w.Code)
<mask>
<mask> var mc mobileConfig
<mask> _, err = plist.Unmarshal(w.Body.Bytes(), &mc)
<mask> assert.Nil(t, err)
<mask>
<mask> if assert.Len(t, mc.PayloadContent, 1) {
<mask> assert.Equal(t, "example.org DoT", mc.PayloadContent[0].Name)
<mask> assert.Equal(t, "example.org DoT", mc.PayloadContent[0].PayloadDisplayName)
<mask> assert.Equal(t, "cli42.example.org", mc.PayloadContent[0].DNSSettings.ServerName)
</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, mc.PayloadContent, 1) {
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "cli42.example.org", mc.PayloadContent[0].DNSSettings.ServerName)
}
</s> add require.Len(t, mc.PayloadContent, 1)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "cli42.example.org", mc.PayloadContent[0].DNSSettings.ServerName) </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, mc.PayloadContent, 1) {
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
}
</s> add require.Len(t, mc.PayloadContent, 1)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName) </s> remove if assert.Len(t, mc.PayloadContent, 1) {
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
}
</s> add require.Len(t, mc.PayloadContent, 1)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/mobileconfig_test.go |
require.Len(t, mc.PayloadContent, 1)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "cli42.example.org", mc.PayloadContent[0].DNSSettings.ServerName) | <mask> var mc mobileConfig
<mask> _, err = plist.Unmarshal(w.Body.Bytes(), &mc)
<mask> assert.Nil(t, err)
<mask>
<mask> if assert.Len(t, mc.PayloadContent, 1) {
<mask> assert.Equal(t, "example.org DoT", mc.PayloadContent[0].Name)
<mask> assert.Equal(t, "example.org DoT", mc.PayloadContent[0].PayloadDisplayName)
<mask> assert.Equal(t, "cli42.example.org", mc.PayloadContent[0].DNSSettings.ServerName)
<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)
</s> add require.Nil(t, err) </s> remove if assert.Len(t, mc.PayloadContent, 1) {
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
}
</s> add require.Len(t, mc.PayloadContent, 1)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName) </s> remove if assert.Len(t, mc.PayloadContent, 1) {
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
}
</s> add require.Len(t, mc.PayloadContent, 1)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].Name)
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].PayloadDisplayName)
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName) </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",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/mobileconfig_test.go |
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" | <mask> "net"
<mask> "testing"
<mask> )
<mask>
<mask> func testParseOK(t *testing.T, ss ...string) options {
<mask> t.Helper()
<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 func testParseOk(t *testing.T, ss ...string) options {
</s> add func testParseOK(t *testing.T, ss ...string) options {
t.Helper()
</s> remove if err != nil {
t.Fatal(err.Error())
}
</s> add require.Nil(t, err)
</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) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/options_test.go |
func testParseOK(t *testing.T, ss ...string) options {
t.Helper()
| <mask> "net"
<mask> "testing"
<mask> )
<mask>
<mask> func testParseOk(t *testing.T, ss ...string) options {
<mask> o, _, err := parse("", ss)
<mask> if err != nil {
<mask> t.Fatal(err.Error())
<mask> }
<mask> return o
</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 err != nil {
t.Fatal(err.Error())
}
</s> add require.Nil(t, err)
</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 go func() { _ = http.Serve(listener, mux) }()
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/options_test.go |
require.Nil(t, err)
| <mask> )
<mask>
<mask> func testParseOk(t *testing.T, ss ...string) options {
<mask> o, _, err := parse("", ss)
<mask> if err != nil {
<mask> t.Fatal(err.Error())
<mask> }
<mask> return o
<mask> }
<mask>
<mask> func testParseErr(t *testing.T, descr string, ss ...string) {
<mask> _, _, err := parse("", ss)
</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 testParseOk(t *testing.T, ss ...string) options {
</s> add func testParseOK(t *testing.T, ss ...string) options {
t.Helper()
</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 makeHandler := func(err *error) http.HandlerFunc {
</s> add makeHandler := func(t *testing.T, err *error) http.HandlerFunc {
t.Helper()
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/options_test.go |
t.Helper()
| <mask> }
<mask>
<mask> func testParseErr(t *testing.T, descr string, ss ...string) {
<mask> _, _, err := parse("", ss)
<mask> require.NotNilf(t, err, "expected an error because %s but no error returned", descr)
<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 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 if err != nil {
t.Fatal(err.Error())
}
</s> add require.Nil(t, err)
</s> remove func testParseOk(t *testing.T, ss ...string) options {
</s> add func testParseOK(t *testing.T, ss ...string) options {
t.Helper()
</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 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",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/options_test.go |
require.NotNilf(t, err, "expected an error because %s but no error returned", descr) | <mask> }
<mask>
<mask> func testParseErr(t *testing.T, descr string, ss ...string) {
<mask> _, _, err := parse("", ss)
<mask> if err == nil {
<mask> t.Fatalf("expected an error because %s but no error returned", descr)
<mask> }
<mask> }
<mask>
<mask> func testParseParamMissing(t *testing.T, param string) {
<mask> testParseErr(t, fmt.Sprintf("%s parameter missing", param), param)
<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 err != nil {
t.Fatal(err.Error())
}
</s> add require.Nil(t, err)
</s> remove func testParseOk(t *testing.T, ss ...string) options {
</s> add func testParseOK(t *testing.T, ss ...string) options {
t.Helper()
</s> remove if testParseOk(t).verbose {
t.Fatal("empty is not verbose")
}
if !testParseOk(t, "-v").verbose {
t.Fatal("-v is verbose")
}
if !testParseOk(t, "--verbose").verbose {
t.Fatal("--verbose is verbose")
}
</s> add assert.False(t, testParseOK(t).verbose, "empty is not verbose")
assert.True(t, testParseOK(t, "-v").verbose, "-v is verbose")
assert.True(t, testParseOK(t, "--verbose").verbose, "--verbose is verbose") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/options_test.go |
t.Helper()
| <mask> }
<mask>
<mask> func testParseParamMissing(t *testing.T, param string) {
<mask> testParseErr(t, fmt.Sprintf("%s parameter missing", param), param)
<mask> }
<mask>
<mask> func TestParseVerbose(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 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 if testParseOk(t).verbose {
t.Fatal("empty is not verbose")
}
if !testParseOk(t, "-v").verbose {
t.Fatal("-v is verbose")
}
if !testParseOk(t, "--verbose").verbose {
t.Fatal("--verbose is verbose")
}
</s> add assert.False(t, testParseOK(t).verbose, "empty is not verbose")
assert.True(t, testParseOK(t, "-v").verbose, "-v is verbose")
assert.True(t, testParseOK(t, "--verbose").verbose, "--verbose is verbose") </s> remove if testParseOk(t).glinetMode {
t.Fatal("empty is not GL-Inet mode")
}
if !testParseOk(t, "--glinet").glinetMode {
t.Fatal("--glinet is GL-Inet mode")
}
</s> add assert.False(t, testParseOK(t).glinetMode, "empty is not GL-Inet mode")
assert.True(t, testParseOK(t, "--glinet").glinetMode, "--glinet is GL-Inet mode") </s> remove }
</s> add </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",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/options_test.go |
assert.False(t, testParseOK(t).verbose, "empty is not verbose")
assert.True(t, testParseOK(t, "-v").verbose, "-v is verbose")
assert.True(t, testParseOK(t, "--verbose").verbose, "--verbose is verbose") | <mask> testParseErr(t, fmt.Sprintf("%s parameter missing", param), param)
<mask> }
<mask>
<mask> func TestParseVerbose(t *testing.T) {
<mask> if testParseOk(t).verbose {
<mask> t.Fatal("empty is not verbose")
<mask> }
<mask> if !testParseOk(t, "-v").verbose {
<mask> t.Fatal("-v is verbose")
<mask> }
<mask> if !testParseOk(t, "--verbose").verbose {
<mask> t.Fatal("--verbose is verbose")
<mask> }
<mask> }
<mask>
<mask> func TestParseConfigFilename(t *testing.T) {
<mask> if testParseOk(t).configFilename != "" {
<mask> t.Fatal("empty is no config filename")
</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 testParseOk(t).configFilename != "" {
t.Fatal("empty is no config filename")
}
if testParseOk(t, "-c", "path").configFilename != "path" {
t.Fatal("-c is config filename")
}
</s> add assert.Equal(t, "", testParseOK(t).configFilename, "empty is no config filename")
assert.Equal(t, "path", testParseOK(t, "-c", "path").configFilename, "-c is config filename") </s> remove if testParseOk(t).disableMemoryOptimization {
t.Fatal("empty is not disable update")
}
if !testParseOk(t, "--no-mem-optimization").disableMemoryOptimization {
t.Fatal("--no-mem-optimization is disable update")
}
</s> add assert.False(t, testParseOK(t).disableMemoryOptimization, "empty is not disable update")
assert.True(t, testParseOK(t, "--no-mem-optimization").disableMemoryOptimization, "--no-mem-optimization is disable update") </s> remove if testParseOk(t).checkConfig {
t.Fatal("empty is not check config")
}
if !testParseOk(t, "--check-config").checkConfig {
t.Fatal("--check-config is check config")
}
</s> add assert.False(t, testParseOK(t).checkConfig, "empty is not check config")
assert.True(t, testParseOK(t, "--check-config").checkConfig, "--check-config is check config") </s> remove if testParseOk(t).disableUpdate {
t.Fatal("empty is not disable update")
}
if !testParseOk(t, "--no-check-update").disableUpdate {
t.Fatal("--no-check-update is disable update")
}
</s> add assert.False(t, testParseOK(t).disableUpdate, "empty is not disable update")
assert.True(t, testParseOK(t, "--no-check-update").disableUpdate, "--no-check-update is disable update") | [
"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/home/options_test.go |
assert.Equal(t, "", testParseOK(t).configFilename, "empty is no config filename")
assert.Equal(t, "path", testParseOK(t, "-c", "path").configFilename, "-c is config filename") | <mask> }
<mask> }
<mask>
<mask> func TestParseConfigFilename(t *testing.T) {
<mask> if testParseOk(t).configFilename != "" {
<mask> t.Fatal("empty is no config filename")
<mask> }
<mask> if testParseOk(t, "-c", "path").configFilename != "path" {
<mask> t.Fatal("-c is config filename")
<mask> }
<mask> testParseParamMissing(t, "-c")
<mask> if testParseOk(t, "--config", "path").configFilename != "path" {
<mask> t.Fatal("--configFilename is config filename")
<mask> }
<mask> testParseParamMissing(t, "--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 if testParseOk(t, "--config", "path").configFilename != "path" {
t.Fatal("--configFilename is config filename")
}
</s> add assert.Equal(t, "path", testParseOK(t, "--config", "path").configFilename, "--config is config filename") </s> remove if testParseOk(t).workDir != "" {
t.Fatal("empty is no work dir")
}
if testParseOk(t, "-w", "path").workDir != "path" {
t.Fatal("-w is work dir")
}
</s> add assert.Equal(t, "", testParseOK(t).workDir, "empty is no work dir")
assert.Equal(t, "path", testParseOK(t, "-w", "path").workDir, "-w is work dir") </s> remove if testParseOk(t).verbose {
t.Fatal("empty is not verbose")
}
if !testParseOk(t, "-v").verbose {
t.Fatal("-v is verbose")
}
if !testParseOk(t, "--verbose").verbose {
t.Fatal("--verbose is verbose")
}
</s> add assert.False(t, testParseOK(t).verbose, "empty is not verbose")
assert.True(t, testParseOK(t, "-v").verbose, "-v is verbose")
assert.True(t, testParseOK(t, "--verbose").verbose, "--verbose is verbose") </s> remove if testParseOk(t, "--work-dir", "path").workDir != "path" {
t.Fatal("--work-dir is work dir")
}
</s> add assert.Equal(t, "path", testParseOK(t, "--work-dir", "path").workDir, "--work-dir is work dir") </s> remove if testParseOk(t).logFile != "" {
t.Fatal("empty is no log file")
}
if testParseOk(t, "-l", "path").logFile != "path" {
t.Fatal("-l is log file")
}
if testParseOk(t, "--logfile", "path").logFile != "path" {
t.Fatal("--logfile is log file")
}
</s> add assert.Equal(t, "", testParseOK(t).logFile, "empty is no log file")
assert.Equal(t, "path", testParseOK(t, "-l", "path").logFile, "-l is log file")
assert.Equal(t, "path", testParseOK(t, "--logfile", "path").logFile, "--logfile is log file") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/options_test.go |
assert.Equal(t, "path", testParseOK(t, "--config", "path").configFilename, "--config is config filename") | <mask> if testParseOk(t, "-c", "path").configFilename != "path" {
<mask> t.Fatal("-c is config filename")
<mask> }
<mask> testParseParamMissing(t, "-c")
<mask> if testParseOk(t, "--config", "path").configFilename != "path" {
<mask> t.Fatal("--configFilename is config filename")
<mask> }
<mask> testParseParamMissing(t, "--config")
<mask> }
<mask>
<mask> func TestParseWorkDir(t *testing.T) {
<mask> if testParseOk(t).workDir != "" {
</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 testParseOk(t).configFilename != "" {
t.Fatal("empty is no config filename")
}
if testParseOk(t, "-c", "path").configFilename != "path" {
t.Fatal("-c is config filename")
}
</s> add assert.Equal(t, "", testParseOK(t).configFilename, "empty is no config filename")
assert.Equal(t, "path", testParseOK(t, "-c", "path").configFilename, "-c is config filename") </s> remove if testParseOk(t).workDir != "" {
t.Fatal("empty is no work dir")
}
if testParseOk(t, "-w", "path").workDir != "path" {
t.Fatal("-w is work dir")
}
</s> add assert.Equal(t, "", testParseOK(t).workDir, "empty is no work dir")
assert.Equal(t, "path", testParseOK(t, "-w", "path").workDir, "-w is work dir") </s> remove if testParseOk(t, "--work-dir", "path").workDir != "path" {
t.Fatal("--work-dir is work dir")
}
</s> add assert.Equal(t, "path", testParseOK(t, "--work-dir", "path").workDir, "--work-dir is work dir") </s> remove if testParseOk(t).bindPort != 0 {
t.Fatal("empty is port 0")
}
if testParseOk(t, "-p", "65535").bindPort != 65535 {
t.Fatal("-p is port")
}
</s> add assert.Equal(t, 0, testParseOK(t).bindPort, "empty is port 0")
assert.Equal(t, 65535, testParseOK(t, "-p", "65535").bindPort, "-p is port") </s> remove if testParseOk(t).logFile != "" {
t.Fatal("empty is no log file")
}
if testParseOk(t, "-l", "path").logFile != "path" {
t.Fatal("-l is log file")
}
if testParseOk(t, "--logfile", "path").logFile != "path" {
t.Fatal("--logfile is log file")
}
</s> add assert.Equal(t, "", testParseOK(t).logFile, "empty is no log file")
assert.Equal(t, "path", testParseOK(t, "-l", "path").logFile, "-l is log file")
assert.Equal(t, "path", testParseOK(t, "--logfile", "path").logFile, "--logfile is log file") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/options_test.go |
assert.Equal(t, "", testParseOK(t).workDir, "empty is no work dir")
assert.Equal(t, "path", testParseOK(t, "-w", "path").workDir, "-w is work dir") | <mask> testParseParamMissing(t, "--config")
<mask> }
<mask>
<mask> func TestParseWorkDir(t *testing.T) {
<mask> if testParseOk(t).workDir != "" {
<mask> t.Fatal("empty is no work dir")
<mask> }
<mask> if testParseOk(t, "-w", "path").workDir != "path" {
<mask> t.Fatal("-w is work dir")
<mask> }
<mask> testParseParamMissing(t, "-w")
<mask> if testParseOk(t, "--work-dir", "path").workDir != "path" {
<mask> t.Fatal("--work-dir is work dir")
<mask> }
<mask> testParseParamMissing(t, "--work-dir")
</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 testParseOk(t, "--work-dir", "path").workDir != "path" {
t.Fatal("--work-dir is work dir")
}
</s> add assert.Equal(t, "path", testParseOK(t, "--work-dir", "path").workDir, "--work-dir is work dir") </s> remove if testParseOk(t, "--config", "path").configFilename != "path" {
t.Fatal("--configFilename is config filename")
}
</s> add assert.Equal(t, "path", testParseOK(t, "--config", "path").configFilename, "--config is config filename") </s> remove if testParseOk(t).configFilename != "" {
t.Fatal("empty is no config filename")
}
if testParseOk(t, "-c", "path").configFilename != "path" {
t.Fatal("-c is config filename")
}
</s> add assert.Equal(t, "", testParseOK(t).configFilename, "empty is no config filename")
assert.Equal(t, "path", testParseOK(t, "-c", "path").configFilename, "-c is config filename") </s> remove if testParseOk(t).bindPort != 0 {
t.Fatal("empty is port 0")
}
if testParseOk(t, "-p", "65535").bindPort != 65535 {
t.Fatal("-p is port")
}
</s> add assert.Equal(t, 0, testParseOK(t).bindPort, "empty is port 0")
assert.Equal(t, 65535, testParseOK(t, "-p", "65535").bindPort, "-p is port") </s> remove if testParseOk(t).logFile != "" {
t.Fatal("empty is no log file")
}
if testParseOk(t, "-l", "path").logFile != "path" {
t.Fatal("-l is log file")
}
if testParseOk(t, "--logfile", "path").logFile != "path" {
t.Fatal("--logfile is log file")
}
</s> add assert.Equal(t, "", testParseOK(t).logFile, "empty is no log file")
assert.Equal(t, "path", testParseOK(t, "-l", "path").logFile, "-l is log file")
assert.Equal(t, "path", testParseOK(t, "--logfile", "path").logFile, "--logfile is log file") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/options_test.go |
assert.Equal(t, "path", testParseOK(t, "--work-dir", "path").workDir, "--work-dir is work dir") | <mask> if testParseOk(t, "-w", "path").workDir != "path" {
<mask> t.Fatal("-w is work dir")
<mask> }
<mask> testParseParamMissing(t, "-w")
<mask> if testParseOk(t, "--work-dir", "path").workDir != "path" {
<mask> t.Fatal("--work-dir is work dir")
<mask> }
<mask> testParseParamMissing(t, "--work-dir")
<mask> }
<mask>
<mask> func TestParseBindHost(t *testing.T) {
<mask> if testParseOk(t).bindHost != nil {
</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 testParseOk(t).workDir != "" {
t.Fatal("empty is no work dir")
}
if testParseOk(t, "-w", "path").workDir != "path" {
t.Fatal("-w is work dir")
}
</s> add assert.Equal(t, "", testParseOK(t).workDir, "empty is no work dir")
assert.Equal(t, "path", testParseOK(t, "-w", "path").workDir, "-w is work dir") </s> remove if testParseOk(t, "--config", "path").configFilename != "path" {
t.Fatal("--configFilename is config filename")
}
</s> add assert.Equal(t, "path", testParseOK(t, "--config", "path").configFilename, "--config is config filename") </s> remove if testParseOk(t).configFilename != "" {
t.Fatal("empty is no config filename")
}
if testParseOk(t, "-c", "path").configFilename != "path" {
t.Fatal("-c is config filename")
}
</s> add assert.Equal(t, "", testParseOK(t).configFilename, "empty is no config filename")
assert.Equal(t, "path", testParseOK(t, "-c", "path").configFilename, "-c is config filename") </s> remove if testParseOk(t).bindHost != nil {
t.Fatal("empty is no host")
}
if !testParseOk(t, "-h", "1.2.3.4").bindHost.Equal(net.IP{1, 2, 3, 4}) {
t.Fatal("-h is host")
}
</s> add assert.Nil(t, testParseOK(t).bindHost, "empty is not host")
assert.Equal(t, net.IPv4(1, 2, 3, 4), testParseOK(t, "-h", "1.2.3.4").bindHost, "-h is host") </s> remove if testParseOk(t).bindPort != 0 {
t.Fatal("empty is port 0")
}
if testParseOk(t, "-p", "65535").bindPort != 65535 {
t.Fatal("-p is port")
}
</s> add assert.Equal(t, 0, testParseOK(t).bindPort, "empty is port 0")
assert.Equal(t, 65535, testParseOK(t, "-p", "65535").bindPort, "-p is port") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/options_test.go |
assert.Nil(t, testParseOK(t).bindHost, "empty is not host")
assert.Equal(t, net.IPv4(1, 2, 3, 4), testParseOK(t, "-h", "1.2.3.4").bindHost, "-h is host") | <mask> testParseParamMissing(t, "--work-dir")
<mask> }
<mask>
<mask> func TestParseBindHost(t *testing.T) {
<mask> if testParseOk(t).bindHost != nil {
<mask> t.Fatal("empty is no host")
<mask> }
<mask> if !testParseOk(t, "-h", "1.2.3.4").bindHost.Equal(net.IP{1, 2, 3, 4}) {
<mask> t.Fatal("-h is host")
<mask> }
<mask> testParseParamMissing(t, "-h")
<mask> if !testParseOk(t, "--host", "1.2.3.4").bindHost.Equal(net.IP{1, 2, 3, 4}) {
<mask> t.Fatal("--host is host")
<mask> }
<mask> testParseParamMissing(t, "--host")
</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 !testParseOk(t, "--host", "1.2.3.4").bindHost.Equal(net.IP{1, 2, 3, 4}) {
t.Fatal("--host is host")
}
</s> add assert.Equal(t, net.IPv4(1, 2, 3, 4), testParseOK(t, "--host", "1.2.3.4").bindHost, "--host is host") </s> remove if testParseOk(t, "--work-dir", "path").workDir != "path" {
t.Fatal("--work-dir is work dir")
}
</s> add assert.Equal(t, "path", testParseOK(t, "--work-dir", "path").workDir, "--work-dir is work dir") </s> remove if testParseOk(t).workDir != "" {
t.Fatal("empty is no work dir")
}
if testParseOk(t, "-w", "path").workDir != "path" {
t.Fatal("-w is work dir")
}
</s> add assert.Equal(t, "", testParseOK(t).workDir, "empty is no work dir")
assert.Equal(t, "path", testParseOK(t, "-w", "path").workDir, "-w is work dir") </s> remove if testParseOk(t).bindPort != 0 {
t.Fatal("empty is port 0")
}
if testParseOk(t, "-p", "65535").bindPort != 65535 {
t.Fatal("-p is port")
}
</s> add assert.Equal(t, 0, testParseOK(t).bindPort, "empty is port 0")
assert.Equal(t, 65535, testParseOK(t, "-p", "65535").bindPort, "-p is port") </s> remove if testParseOk(t).configFilename != "" {
t.Fatal("empty is no config filename")
}
if testParseOk(t, "-c", "path").configFilename != "path" {
t.Fatal("-c is config filename")
}
</s> add assert.Equal(t, "", testParseOK(t).configFilename, "empty is no config filename")
assert.Equal(t, "path", testParseOK(t, "-c", "path").configFilename, "-c is config filename") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/options_test.go |
assert.Equal(t, net.IPv4(1, 2, 3, 4), testParseOK(t, "--host", "1.2.3.4").bindHost, "--host is host") | <mask> if !testParseOk(t, "-h", "1.2.3.4").bindHost.Equal(net.IP{1, 2, 3, 4}) {
<mask> t.Fatal("-h is host")
<mask> }
<mask> testParseParamMissing(t, "-h")
<mask> if !testParseOk(t, "--host", "1.2.3.4").bindHost.Equal(net.IP{1, 2, 3, 4}) {
<mask> t.Fatal("--host is host")
<mask> }
<mask> testParseParamMissing(t, "--host")
<mask> }
<mask>
<mask> func TestParseBindPort(t *testing.T) {
<mask> if testParseOk(t).bindPort != 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 if testParseOk(t).bindHost != nil {
t.Fatal("empty is no host")
}
if !testParseOk(t, "-h", "1.2.3.4").bindHost.Equal(net.IP{1, 2, 3, 4}) {
t.Fatal("-h is host")
}
</s> add assert.Nil(t, testParseOK(t).bindHost, "empty is not host")
assert.Equal(t, net.IPv4(1, 2, 3, 4), testParseOK(t, "-h", "1.2.3.4").bindHost, "-h is host") </s> remove if testParseOk(t).bindPort != 0 {
t.Fatal("empty is port 0")
}
if testParseOk(t, "-p", "65535").bindPort != 65535 {
t.Fatal("-p is port")
}
</s> add assert.Equal(t, 0, testParseOK(t).bindPort, "empty is port 0")
assert.Equal(t, 65535, testParseOK(t, "-p", "65535").bindPort, "-p is port") </s> remove if testParseOk(t).workDir != "" {
t.Fatal("empty is no work dir")
}
if testParseOk(t, "-w", "path").workDir != "path" {
t.Fatal("-w is work dir")
}
</s> add assert.Equal(t, "", testParseOK(t).workDir, "empty is no work dir")
assert.Equal(t, "path", testParseOK(t, "-w", "path").workDir, "-w is work dir") </s> remove if testParseOk(t, "--config", "path").configFilename != "path" {
t.Fatal("--configFilename is config filename")
}
</s> add assert.Equal(t, "path", testParseOK(t, "--config", "path").configFilename, "--config is config filename") </s> remove if testParseOk(t, "--work-dir", "path").workDir != "path" {
t.Fatal("--work-dir is work dir")
}
</s> add assert.Equal(t, "path", testParseOK(t, "--work-dir", "path").workDir, "--work-dir is work dir") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/options_test.go |
assert.Equal(t, 0, testParseOK(t).bindPort, "empty is port 0")
assert.Equal(t, 65535, testParseOK(t, "-p", "65535").bindPort, "-p is port") | <mask> testParseParamMissing(t, "--host")
<mask> }
<mask>
<mask> func TestParseBindPort(t *testing.T) {
<mask> if testParseOk(t).bindPort != 0 {
<mask> t.Fatal("empty is port 0")
<mask> }
<mask> if testParseOk(t, "-p", "65535").bindPort != 65535 {
<mask> t.Fatal("-p is port")
<mask> }
<mask> testParseParamMissing(t, "-p")
<mask> if testParseOk(t, "--port", "65535").bindPort != 65535 {
<mask> t.Fatal("--port is port")
<mask> }
<mask> testParseParamMissing(t, "--port")
</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 testParseOk(t, "--port", "65535").bindPort != 65535 {
t.Fatal("--port is port")
}
</s> add assert.Equal(t, 65535, testParseOK(t, "--port", "65535").bindPort, "--port is port") </s> remove }
</s> add </s> remove if !testParseOk(t, "--host", "1.2.3.4").bindHost.Equal(net.IP{1, 2, 3, 4}) {
t.Fatal("--host is host")
}
</s> add assert.Equal(t, net.IPv4(1, 2, 3, 4), testParseOK(t, "--host", "1.2.3.4").bindHost, "--host is host") </s> remove if testParseOk(t).workDir != "" {
t.Fatal("empty is no work dir")
}
if testParseOk(t, "-w", "path").workDir != "path" {
t.Fatal("-w is work dir")
}
</s> add assert.Equal(t, "", testParseOK(t).workDir, "empty is no work dir")
assert.Equal(t, "path", testParseOK(t, "-w", "path").workDir, "-w is work dir") </s> remove if testParseOk(t).configFilename != "" {
t.Fatal("empty is no config filename")
}
if testParseOk(t, "-c", "path").configFilename != "path" {
t.Fatal("-c is config filename")
}
</s> add assert.Equal(t, "", testParseOK(t).configFilename, "empty is no config filename")
assert.Equal(t, "path", testParseOK(t, "-c", "path").configFilename, "-c is config filename") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/options_test.go |
assert.Equal(t, 65535, testParseOK(t, "--port", "65535").bindPort, "--port is port") | <mask> if testParseOk(t, "-p", "65535").bindPort != 65535 {
<mask> t.Fatal("-p is port")
<mask> }
<mask> testParseParamMissing(t, "-p")
<mask> if testParseOk(t, "--port", "65535").bindPort != 65535 {
<mask> t.Fatal("--port is port")
<mask> }
<mask> testParseParamMissing(t, "--port")
<mask> }
<mask>
<mask> func TestParseBindPortBad(t *testing.T) {
<mask> testParseErr(t, "not an int", "-p", "x")
</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 </s> remove if testParseOk(t).bindPort != 0 {
t.Fatal("empty is port 0")
}
if testParseOk(t, "-p", "65535").bindPort != 65535 {
t.Fatal("-p is port")
}
</s> add assert.Equal(t, 0, testParseOK(t).bindPort, "empty is port 0")
assert.Equal(t, 65535, testParseOK(t, "-p", "65535").bindPort, "-p is port") </s> remove func TestParseBindPortBad(t *testing.T) {
</s> add </s> remove if testParseOk(t, "--config", "path").configFilename != "path" {
t.Fatal("--configFilename is config filename")
}
</s> add assert.Equal(t, "path", testParseOK(t, "--config", "path").configFilename, "--config is config filename") </s> remove if testParseOk(t, "--work-dir", "path").workDir != "path" {
t.Fatal("--work-dir is work dir")
}
</s> add assert.Equal(t, "path", testParseOK(t, "--work-dir", "path").workDir, "--work-dir is work dir") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/options_test.go |
<mask> if testParseOk(t, "--port", "65535").bindPort != 65535 {
<mask> t.Fatal("--port is port")
<mask> }
<mask> testParseParamMissing(t, "--port")
<mask> }
<mask>
<mask> func TestParseBindPortBad(t *testing.T) {
<mask> testParseErr(t, "not an int", "-p", "x")
<mask> testParseErr(t, "hex not supported", "-p", "0x100")
<mask> testParseErr(t, "port negative", "-p", "-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 func TestParseBindPortBad(t *testing.T) {
</s> add </s> remove if testParseOk(t, "--port", "65535").bindPort != 65535 {
t.Fatal("--port is port")
}
</s> add assert.Equal(t, 65535, testParseOK(t, "--port", "65535").bindPort, "--port is port") </s> remove if testParseOk(t).bindPort != 0 {
t.Fatal("empty is port 0")
}
if testParseOk(t, "-p", "65535").bindPort != 65535 {
t.Fatal("-p is port")
}
</s> add assert.Equal(t, 0, testParseOK(t).bindPort, "empty is port 0")
assert.Equal(t, 65535, testParseOK(t, "-p", "65535").bindPort, "-p is port") </s> remove if testParseOk(t).logFile != "" {
t.Fatal("empty is no log file")
}
if testParseOk(t, "-l", "path").logFile != "path" {
t.Fatal("-l is log file")
}
if testParseOk(t, "--logfile", "path").logFile != "path" {
t.Fatal("--logfile is log file")
}
</s> add assert.Equal(t, "", testParseOK(t).logFile, "empty is no log file")
assert.Equal(t, "path", testParseOK(t, "-l", "path").logFile, "-l is log file")
assert.Equal(t, "path", testParseOK(t, "--logfile", "path").logFile, "--logfile is log file") </s> remove if testParseOk(t).glinetMode {
t.Fatal("empty is not GL-Inet mode")
}
if !testParseOk(t, "--glinet").glinetMode {
t.Fatal("--glinet is GL-Inet mode")
}
</s> add assert.False(t, testParseOK(t).glinetMode, "empty is not GL-Inet mode")
assert.True(t, testParseOK(t, "--glinet").glinetMode, "--glinet is GL-Inet mode") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/options_test.go | |
<mask> }
<mask> testParseParamMissing(t, "--port")
<mask> }
<mask>
<mask> func TestParseBindPortBad(t *testing.T) {
<mask> testParseErr(t, "not an int", "-p", "x")
<mask> testParseErr(t, "hex not supported", "-p", "0x100")
<mask> testParseErr(t, "port negative", "-p", "-1")
<mask> testParseErr(t, "port too high", "-p", "65536")
<mask> testParseErr(t, "port too high", "-p", "4294967297") // 2^32 + 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 }
</s> add </s> remove if testParseOk(t, "--port", "65535").bindPort != 65535 {
t.Fatal("--port is port")
}
</s> add assert.Equal(t, 65535, testParseOK(t, "--port", "65535").bindPort, "--port is port") </s> remove if testParseOk(t).logFile != "" {
t.Fatal("empty is no log file")
}
if testParseOk(t, "-l", "path").logFile != "path" {
t.Fatal("-l is log file")
}
if testParseOk(t, "--logfile", "path").logFile != "path" {
t.Fatal("--logfile is log file")
}
</s> add assert.Equal(t, "", testParseOK(t).logFile, "empty is no log file")
assert.Equal(t, "path", testParseOK(t, "-l", "path").logFile, "-l is log file")
assert.Equal(t, "path", testParseOK(t, "--logfile", "path").logFile, "--logfile is log file") </s> remove if testParseOk(t).bindPort != 0 {
t.Fatal("empty is port 0")
}
if testParseOk(t, "-p", "65535").bindPort != 65535 {
t.Fatal("-p is port")
}
</s> add assert.Equal(t, 0, testParseOK(t).bindPort, "empty is port 0")
assert.Equal(t, 65535, testParseOK(t, "-p", "65535").bindPort, "-p is port") </s> remove if testParseOk(t).glinetMode {
t.Fatal("empty is not GL-Inet mode")
}
if !testParseOk(t, "--glinet").glinetMode {
t.Fatal("--glinet is GL-Inet mode")
}
</s> add assert.False(t, testParseOK(t).glinetMode, "empty is not GL-Inet mode")
assert.True(t, testParseOK(t, "--glinet").glinetMode, "--glinet is GL-Inet mode") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/options_test.go | |
assert.Equal(t, "", testParseOK(t).logFile, "empty is no log file")
assert.Equal(t, "path", testParseOK(t, "-l", "path").logFile, "-l is log file")
assert.Equal(t, "path", testParseOK(t, "--logfile", "path").logFile, "--logfile is log file") | <mask> testParseErr(t, "port too high", "-p", "18446744073709551617") // 2^64 + 1
<mask> }
<mask>
<mask> func TestParseLogfile(t *testing.T) {
<mask> if testParseOk(t).logFile != "" {
<mask> t.Fatal("empty is no log file")
<mask> }
<mask> if testParseOk(t, "-l", "path").logFile != "path" {
<mask> t.Fatal("-l is log file")
<mask> }
<mask> if testParseOk(t, "--logfile", "path").logFile != "path" {
<mask> t.Fatal("--logfile is log file")
<mask> }
<mask> }
<mask>
<mask> func TestParsePidfile(t *testing.T) {
<mask> if testParseOk(t).pidFile != "" {
<mask> t.Fatal("empty is no pid file")
</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 testParseOk(t).pidFile != "" {
t.Fatal("empty is no pid file")
}
if testParseOk(t, "--pidfile", "path").pidFile != "path" {
t.Fatal("--pidfile is pid file")
}
</s> add assert.Equal(t, "", testParseOK(t).pidFile, "empty is no pid file")
assert.Equal(t, "path", testParseOK(t, "--pidfile", "path").pidFile, "--pidfile is pid file") </s> remove if testParseOk(t).configFilename != "" {
t.Fatal("empty is no config filename")
}
if testParseOk(t, "-c", "path").configFilename != "path" {
t.Fatal("-c is config filename")
}
</s> add assert.Equal(t, "", testParseOK(t).configFilename, "empty is no config filename")
assert.Equal(t, "path", testParseOK(t, "-c", "path").configFilename, "-c is config filename") </s> remove if testParseOk(t).workDir != "" {
t.Fatal("empty is no work dir")
}
if testParseOk(t, "-w", "path").workDir != "path" {
t.Fatal("-w is work dir")
}
</s> add assert.Equal(t, "", testParseOK(t).workDir, "empty is no work dir")
assert.Equal(t, "path", testParseOK(t, "-w", "path").workDir, "-w is work dir") </s> remove if testParseOk(t, "--config", "path").configFilename != "path" {
t.Fatal("--configFilename is config filename")
}
</s> add assert.Equal(t, "path", testParseOK(t, "--config", "path").configFilename, "--config is config filename") </s> remove if testParseOk(t).serviceControlAction != "" {
t.Fatal("empty is no service command")
}
if testParseOk(t, "-s", "command").serviceControlAction != "command" {
t.Fatal("-s is service command")
}
if testParseOk(t, "--service", "command").serviceControlAction != "command" {
t.Fatal("--service is service command")
}
</s> add assert.Equal(t, "", testParseOK(t).serviceControlAction, "empty is not service cmd")
assert.Equal(t, "cmd", testParseOK(t, "-s", "cmd").serviceControlAction, "-s is service cmd")
assert.Equal(t, "cmd", testParseOK(t, "--service", "cmd").serviceControlAction, "--service is service cmd") | [
"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/home/options_test.go |
assert.Equal(t, "", testParseOK(t).pidFile, "empty is no pid file")
assert.Equal(t, "path", testParseOK(t, "--pidfile", "path").pidFile, "--pidfile is pid file") | <mask> }
<mask> }
<mask>
<mask> func TestParsePidfile(t *testing.T) {
<mask> if testParseOk(t).pidFile != "" {
<mask> t.Fatal("empty is no pid file")
<mask> }
<mask> if testParseOk(t, "--pidfile", "path").pidFile != "path" {
<mask> t.Fatal("--pidfile is pid file")
<mask> }
<mask> }
<mask>
<mask> func TestParseCheckConfig(t *testing.T) {
<mask> if testParseOk(t).checkConfig {
<mask> t.Fatal("empty is not check 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 if testParseOk(t).logFile != "" {
t.Fatal("empty is no log file")
}
if testParseOk(t, "-l", "path").logFile != "path" {
t.Fatal("-l is log file")
}
if testParseOk(t, "--logfile", "path").logFile != "path" {
t.Fatal("--logfile is log file")
}
</s> add assert.Equal(t, "", testParseOK(t).logFile, "empty is no log file")
assert.Equal(t, "path", testParseOK(t, "-l", "path").logFile, "-l is log file")
assert.Equal(t, "path", testParseOK(t, "--logfile", "path").logFile, "--logfile is log file") </s> remove if testParseOk(t).checkConfig {
t.Fatal("empty is not check config")
}
if !testParseOk(t, "--check-config").checkConfig {
t.Fatal("--check-config is check config")
}
</s> add assert.False(t, testParseOK(t).checkConfig, "empty is not check config")
assert.True(t, testParseOK(t, "--check-config").checkConfig, "--check-config is check config") </s> remove if testParseOk(t).configFilename != "" {
t.Fatal("empty is no config filename")
}
if testParseOk(t, "-c", "path").configFilename != "path" {
t.Fatal("-c is config filename")
}
</s> add assert.Equal(t, "", testParseOK(t).configFilename, "empty is no config filename")
assert.Equal(t, "path", testParseOK(t, "-c", "path").configFilename, "-c is config filename") </s> remove if testParseOk(t).workDir != "" {
t.Fatal("empty is no work dir")
}
if testParseOk(t, "-w", "path").workDir != "path" {
t.Fatal("-w is work dir")
}
</s> add assert.Equal(t, "", testParseOK(t).workDir, "empty is no work dir")
assert.Equal(t, "path", testParseOK(t, "-w", "path").workDir, "-w is work dir") </s> remove if testParseOk(t).serviceControlAction != "" {
t.Fatal("empty is no service command")
}
if testParseOk(t, "-s", "command").serviceControlAction != "command" {
t.Fatal("-s is service command")
}
if testParseOk(t, "--service", "command").serviceControlAction != "command" {
t.Fatal("--service is service command")
}
</s> add assert.Equal(t, "", testParseOK(t).serviceControlAction, "empty is not service cmd")
assert.Equal(t, "cmd", testParseOK(t, "-s", "cmd").serviceControlAction, "-s is service cmd")
assert.Equal(t, "cmd", testParseOK(t, "--service", "cmd").serviceControlAction, "--service is service cmd") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/options_test.go |
assert.False(t, testParseOK(t).checkConfig, "empty is not check config")
assert.True(t, testParseOK(t, "--check-config").checkConfig, "--check-config is check config") | <mask> }
<mask> }
<mask>
<mask> func TestParseCheckConfig(t *testing.T) {
<mask> if testParseOk(t).checkConfig {
<mask> t.Fatal("empty is not check config")
<mask> }
<mask> if !testParseOk(t, "--check-config").checkConfig {
<mask> t.Fatal("--check-config is check config")
<mask> }
<mask> }
<mask>
<mask> func TestParseDisableUpdate(t *testing.T) {
<mask> if testParseOk(t).disableUpdate {
<mask> t.Fatal("empty is not disable update")
</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 testParseOk(t).disableUpdate {
t.Fatal("empty is not disable update")
}
if !testParseOk(t, "--no-check-update").disableUpdate {
t.Fatal("--no-check-update is disable update")
}
</s> add assert.False(t, testParseOK(t).disableUpdate, "empty is not disable update")
assert.True(t, testParseOK(t, "--no-check-update").disableUpdate, "--no-check-update is disable update") </s> remove if testParseOk(t).disableMemoryOptimization {
t.Fatal("empty is not disable update")
}
if !testParseOk(t, "--no-mem-optimization").disableMemoryOptimization {
t.Fatal("--no-mem-optimization is disable update")
}
</s> add assert.False(t, testParseOK(t).disableMemoryOptimization, "empty is not disable update")
assert.True(t, testParseOK(t, "--no-mem-optimization").disableMemoryOptimization, "--no-mem-optimization is disable update") </s> remove if testParseOk(t).pidFile != "" {
t.Fatal("empty is no pid file")
}
if testParseOk(t, "--pidfile", "path").pidFile != "path" {
t.Fatal("--pidfile is pid file")
}
</s> add assert.Equal(t, "", testParseOK(t).pidFile, "empty is no pid file")
assert.Equal(t, "path", testParseOK(t, "--pidfile", "path").pidFile, "--pidfile is pid file") </s> remove if testParseOk(t).verbose {
t.Fatal("empty is not verbose")
}
if !testParseOk(t, "-v").verbose {
t.Fatal("-v is verbose")
}
if !testParseOk(t, "--verbose").verbose {
t.Fatal("--verbose is verbose")
}
</s> add assert.False(t, testParseOK(t).verbose, "empty is not verbose")
assert.True(t, testParseOK(t, "-v").verbose, "-v is verbose")
assert.True(t, testParseOK(t, "--verbose").verbose, "--verbose is verbose") </s> remove if testParseOk(t).glinetMode {
t.Fatal("empty is not GL-Inet mode")
}
if !testParseOk(t, "--glinet").glinetMode {
t.Fatal("--glinet is GL-Inet mode")
}
</s> add assert.False(t, testParseOK(t).glinetMode, "empty is not GL-Inet mode")
assert.True(t, testParseOK(t, "--glinet").glinetMode, "--glinet is GL-Inet mode") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/options_test.go |
assert.False(t, testParseOK(t).disableUpdate, "empty is not disable update")
assert.True(t, testParseOK(t, "--no-check-update").disableUpdate, "--no-check-update is disable update") | <mask> }
<mask> }
<mask>
<mask> func TestParseDisableUpdate(t *testing.T) {
<mask> if testParseOk(t).disableUpdate {
<mask> t.Fatal("empty is not disable update")
<mask> }
<mask> if !testParseOk(t, "--no-check-update").disableUpdate {
<mask> t.Fatal("--no-check-update is disable update")
<mask> }
<mask> }
<mask>
<mask> func TestParseDisableMemoryOptimization(t *testing.T) {
<mask> if testParseOk(t).disableMemoryOptimization {
<mask> t.Fatal("empty is not disable update")
</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 testParseOk(t).disableMemoryOptimization {
t.Fatal("empty is not disable update")
}
if !testParseOk(t, "--no-mem-optimization").disableMemoryOptimization {
t.Fatal("--no-mem-optimization is disable update")
}
</s> add assert.False(t, testParseOK(t).disableMemoryOptimization, "empty is not disable update")
assert.True(t, testParseOK(t, "--no-mem-optimization").disableMemoryOptimization, "--no-mem-optimization is disable update") </s> remove if testParseOk(t).checkConfig {
t.Fatal("empty is not check config")
}
if !testParseOk(t, "--check-config").checkConfig {
t.Fatal("--check-config is check config")
}
</s> add assert.False(t, testParseOK(t).checkConfig, "empty is not check config")
assert.True(t, testParseOK(t, "--check-config").checkConfig, "--check-config is check config") </s> remove if testParseOk(t).verbose {
t.Fatal("empty is not verbose")
}
if !testParseOk(t, "-v").verbose {
t.Fatal("-v is verbose")
}
if !testParseOk(t, "--verbose").verbose {
t.Fatal("--verbose is verbose")
}
</s> add assert.False(t, testParseOK(t).verbose, "empty is not verbose")
assert.True(t, testParseOK(t, "-v").verbose, "-v is verbose")
assert.True(t, testParseOK(t, "--verbose").verbose, "--verbose is verbose") </s> remove if testParseOk(t).glinetMode {
t.Fatal("empty is not GL-Inet mode")
}
if !testParseOk(t, "--glinet").glinetMode {
t.Fatal("--glinet is GL-Inet mode")
}
</s> add assert.False(t, testParseOK(t).glinetMode, "empty is not GL-Inet mode")
assert.True(t, testParseOK(t, "--glinet").glinetMode, "--glinet is GL-Inet mode") </s> remove if testParseOk(t).serviceControlAction != "" {
t.Fatal("empty is no service command")
}
if testParseOk(t, "-s", "command").serviceControlAction != "command" {
t.Fatal("-s is service command")
}
if testParseOk(t, "--service", "command").serviceControlAction != "command" {
t.Fatal("--service is service command")
}
</s> add assert.Equal(t, "", testParseOK(t).serviceControlAction, "empty is not service cmd")
assert.Equal(t, "cmd", testParseOK(t, "-s", "cmd").serviceControlAction, "-s is service cmd")
assert.Equal(t, "cmd", testParseOK(t, "--service", "cmd").serviceControlAction, "--service is service cmd") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/options_test.go |
assert.False(t, testParseOK(t).disableMemoryOptimization, "empty is not disable update")
assert.True(t, testParseOK(t, "--no-mem-optimization").disableMemoryOptimization, "--no-mem-optimization is disable update") | <mask> }
<mask> }
<mask>
<mask> func TestParseDisableMemoryOptimization(t *testing.T) {
<mask> if testParseOk(t).disableMemoryOptimization {
<mask> t.Fatal("empty is not disable update")
<mask> }
<mask> if !testParseOk(t, "--no-mem-optimization").disableMemoryOptimization {
<mask> t.Fatal("--no-mem-optimization is disable update")
<mask> }
<mask> }
<mask>
<mask> func TestParseService(t *testing.T) {
<mask> if testParseOk(t).serviceControlAction != "" {
<mask> t.Fatal("empty is no service command")
</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 testParseOk(t).disableUpdate {
t.Fatal("empty is not disable update")
}
if !testParseOk(t, "--no-check-update").disableUpdate {
t.Fatal("--no-check-update is disable update")
}
</s> add assert.False(t, testParseOK(t).disableUpdate, "empty is not disable update")
assert.True(t, testParseOK(t, "--no-check-update").disableUpdate, "--no-check-update is disable update") </s> remove if testParseOk(t).serviceControlAction != "" {
t.Fatal("empty is no service command")
}
if testParseOk(t, "-s", "command").serviceControlAction != "command" {
t.Fatal("-s is service command")
}
if testParseOk(t, "--service", "command").serviceControlAction != "command" {
t.Fatal("--service is service command")
}
</s> add assert.Equal(t, "", testParseOK(t).serviceControlAction, "empty is not service cmd")
assert.Equal(t, "cmd", testParseOK(t, "-s", "cmd").serviceControlAction, "-s is service cmd")
assert.Equal(t, "cmd", testParseOK(t, "--service", "cmd").serviceControlAction, "--service is service cmd") </s> remove if testParseOk(t).checkConfig {
t.Fatal("empty is not check config")
}
if !testParseOk(t, "--check-config").checkConfig {
t.Fatal("--check-config is check config")
}
</s> add assert.False(t, testParseOK(t).checkConfig, "empty is not check config")
assert.True(t, testParseOK(t, "--check-config").checkConfig, "--check-config is check config") </s> remove if testParseOk(t).verbose {
t.Fatal("empty is not verbose")
}
if !testParseOk(t, "-v").verbose {
t.Fatal("-v is verbose")
}
if !testParseOk(t, "--verbose").verbose {
t.Fatal("--verbose is verbose")
}
</s> add assert.False(t, testParseOK(t).verbose, "empty is not verbose")
assert.True(t, testParseOK(t, "-v").verbose, "-v is verbose")
assert.True(t, testParseOK(t, "--verbose").verbose, "--verbose is verbose") </s> remove if testParseOk(t).pidFile != "" {
t.Fatal("empty is no pid file")
}
if testParseOk(t, "--pidfile", "path").pidFile != "path" {
t.Fatal("--pidfile is pid file")
}
</s> add assert.Equal(t, "", testParseOK(t).pidFile, "empty is no pid file")
assert.Equal(t, "path", testParseOK(t, "--pidfile", "path").pidFile, "--pidfile is pid file") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/options_test.go |
assert.Equal(t, "", testParseOK(t).serviceControlAction, "empty is not service cmd")
assert.Equal(t, "cmd", testParseOK(t, "-s", "cmd").serviceControlAction, "-s is service cmd")
assert.Equal(t, "cmd", testParseOK(t, "--service", "cmd").serviceControlAction, "--service is service cmd") | <mask> }
<mask> }
<mask>
<mask> func TestParseService(t *testing.T) {
<mask> if testParseOk(t).serviceControlAction != "" {
<mask> t.Fatal("empty is no service command")
<mask> }
<mask> if testParseOk(t, "-s", "command").serviceControlAction != "command" {
<mask> t.Fatal("-s is service command")
<mask> }
<mask> if testParseOk(t, "--service", "command").serviceControlAction != "command" {
<mask> t.Fatal("--service is service command")
<mask> }
<mask> }
<mask>
<mask> func TestParseGLInet(t *testing.T) {
<mask> if testParseOk(t).glinetMode {
<mask> t.Fatal("empty is not GL-Inet mode")
</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 testParseOk(t).disableMemoryOptimization {
t.Fatal("empty is not disable update")
}
if !testParseOk(t, "--no-mem-optimization").disableMemoryOptimization {
t.Fatal("--no-mem-optimization is disable update")
}
</s> add assert.False(t, testParseOK(t).disableMemoryOptimization, "empty is not disable update")
assert.True(t, testParseOK(t, "--no-mem-optimization").disableMemoryOptimization, "--no-mem-optimization is disable update") </s> remove if testParseOk(t).glinetMode {
t.Fatal("empty is not GL-Inet mode")
}
if !testParseOk(t, "--glinet").glinetMode {
t.Fatal("--glinet is GL-Inet mode")
}
</s> add assert.False(t, testParseOK(t).glinetMode, "empty is not GL-Inet mode")
assert.True(t, testParseOK(t, "--glinet").glinetMode, "--glinet is GL-Inet mode") </s> remove if testParseOk(t).pidFile != "" {
t.Fatal("empty is no pid file")
}
if testParseOk(t, "--pidfile", "path").pidFile != "path" {
t.Fatal("--pidfile is pid file")
}
</s> add assert.Equal(t, "", testParseOK(t).pidFile, "empty is no pid file")
assert.Equal(t, "path", testParseOK(t, "--pidfile", "path").pidFile, "--pidfile is pid file") </s> remove if testParseOk(t).logFile != "" {
t.Fatal("empty is no log file")
}
if testParseOk(t, "-l", "path").logFile != "path" {
t.Fatal("-l is log file")
}
if testParseOk(t, "--logfile", "path").logFile != "path" {
t.Fatal("--logfile is log file")
}
</s> add assert.Equal(t, "", testParseOK(t).logFile, "empty is no log file")
assert.Equal(t, "path", testParseOK(t, "-l", "path").logFile, "-l is log file")
assert.Equal(t, "path", testParseOK(t, "--logfile", "path").logFile, "--logfile is log file") </s> remove if testParseOk(t).configFilename != "" {
t.Fatal("empty is no config filename")
}
if testParseOk(t, "-c", "path").configFilename != "path" {
t.Fatal("-c is config filename")
}
</s> add assert.Equal(t, "", testParseOK(t).configFilename, "empty is no config filename")
assert.Equal(t, "path", testParseOK(t, "-c", "path").configFilename, "-c is config filename") | [
"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/home/options_test.go |
assert.False(t, testParseOK(t).glinetMode, "empty is not GL-Inet mode")
assert.True(t, testParseOK(t, "--glinet").glinetMode, "--glinet is GL-Inet mode") | <mask> }
<mask> }
<mask>
<mask> func TestParseGLInet(t *testing.T) {
<mask> if testParseOk(t).glinetMode {
<mask> t.Fatal("empty is not GL-Inet mode")
<mask> }
<mask> if !testParseOk(t, "--glinet").glinetMode {
<mask> t.Fatal("--glinet is GL-Inet mode")
<mask> }
<mask> }
<mask>
<mask> func TestParseUnknown(t *testing.T) {
<mask> testParseErr(t, "unknown word", "x")
<mask> testParseErr(t, "unknown short", "-x")
</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 testParseOk(t).serviceControlAction != "" {
t.Fatal("empty is no service command")
}
if testParseOk(t, "-s", "command").serviceControlAction != "command" {
t.Fatal("-s is service command")
}
if testParseOk(t, "--service", "command").serviceControlAction != "command" {
t.Fatal("--service is service command")
}
</s> add assert.Equal(t, "", testParseOK(t).serviceControlAction, "empty is not service cmd")
assert.Equal(t, "cmd", testParseOK(t, "-s", "cmd").serviceControlAction, "-s is service cmd")
assert.Equal(t, "cmd", testParseOK(t, "--service", "cmd").serviceControlAction, "--service is service cmd") </s> remove if testParseOk(t).verbose {
t.Fatal("empty is not verbose")
}
if !testParseOk(t, "-v").verbose {
t.Fatal("-v is verbose")
}
if !testParseOk(t, "--verbose").verbose {
t.Fatal("--verbose is verbose")
}
</s> add assert.False(t, testParseOK(t).verbose, "empty is not verbose")
assert.True(t, testParseOK(t, "-v").verbose, "-v is verbose")
assert.True(t, testParseOK(t, "--verbose").verbose, "--verbose is verbose") </s> remove if testParseOk(t).disableUpdate {
t.Fatal("empty is not disable update")
}
if !testParseOk(t, "--no-check-update").disableUpdate {
t.Fatal("--no-check-update is disable update")
}
</s> add assert.False(t, testParseOK(t).disableUpdate, "empty is not disable update")
assert.True(t, testParseOK(t, "--no-check-update").disableUpdate, "--no-check-update is disable update") </s> remove if testParseOk(t).checkConfig {
t.Fatal("empty is not check config")
}
if !testParseOk(t, "--check-config").checkConfig {
t.Fatal("--check-config is check config")
}
</s> add assert.False(t, testParseOK(t).checkConfig, "empty is not check config")
assert.True(t, testParseOK(t, "--check-config").checkConfig, "--check-config is check config") </s> remove }
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/home/options_test.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.