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 |
|---|---|---|---|---|
newconfig.ResolverAddress = fmt.Sprintf("%s:%d", config.DNS.BindHost, config.DNS.Port) | <mask> FilteringConfig: config.DNS.FilteringConfig,
<mask> Filters: filters,
<mask> }
<mask>
<mask> if config.TLS.Enabled {
<mask> newconfig.TLSConfig = config.TLS.TLSConfig
<mask> if config.TLS.PortDNSOverTLS != 0 {
<mask> newconfig.TLSListenAddr = &net.TCPAddr{IP: net.ParseIP(config.DNS.BindHost), Port: config.TLS.PortDNSOverTLS}
</s> + parental, safesearch: use our own DNS resolver instead of system default </s> remove ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17
ParentalEnabled bool `yaml:"parental_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
</s> add ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17
ParentalEnabled bool `yaml:"parental_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
ResolverAddress string // DNS server address | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a1b18776678ee894cd0b558cf8683845056a2dfa | dns.go |
"context" | <mask> import (
<mask> "bufio"
<mask> "bytes"
<mask> "crypto/sha256"
<mask> "encoding/json"
<mask> "errors"
<mask> "fmt"
<mask> "io/ioutil"
<mask> "net"
</s> + parental, safesearch: use our own DNS resolver instead of system default </s> remove ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17
ParentalEnabled bool `yaml:"parental_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
</s> add ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17
ParentalEnabled bool `yaml:"parental_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
ResolverAddress string // DNS server address | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a1b18776678ee894cd0b558cf8683845056a2dfa | dnsfilter/dnsfilter.go |
"github.com/AdguardTeam/dnsproxy/upstream" | <mask> "time"
<mask>
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/bluele/gcache"
<mask> "golang.org/x/net/publicsuffix"
<mask> )
<mask>
<mask> const defaultCacheSize = 64 * 1024 // in number of elements
</s> + parental, safesearch: use our own DNS resolver instead of system default </s> remove ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17
ParentalEnabled bool `yaml:"parental_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
</s> add ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17
ParentalEnabled bool `yaml:"parental_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
ResolverAddress string // DNS server address | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a1b18776678ee894cd0b558cf8683845056a2dfa | dnsfilter/dnsfilter.go |
ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17
ParentalEnabled bool `yaml:"parental_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
ResolverAddress string // DNS server address | <mask> const enableDelayedCompilation = true // flag for debugging, must be true in production for faster performance
<mask>
<mask> // Config allows you to configure DNS filtering with New() or just change variables directly.
<mask> type Config struct {
<mask> ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17
<mask> ParentalEnabled bool `yaml:"parental_enabled"`
<mask> SafeSearchEnabled bool `yaml:"safesearch_enabled"`
<mask> SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
<mask> }
<mask>
<mask> type privateConfig struct {
<mask> parentalServer string // access via methods
<mask> safeBrowsingServer string // access via methods
</s> + parental, safesearch: use our own DNS resolver instead of system default | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a1b18776678ee894cd0b558cf8683845056a2dfa | dnsfilter/dnsfilter.go |
var resolverAddr string // DNS server address
| <mask> safeSearchCache gcache.Cache
<mask> )
<mask>
<mask> // Result holds state of hostname check
<mask> type Result struct {
<mask> IsFiltered bool `json:",omitempty"` // True if the host name is filtered
<mask> Reason Reason `json:",omitempty"` // Reason for blocking / unblocking
<mask> Rule string `json:",omitempty"` // Original rule text
</s> + parental, safesearch: use our own DNS resolver instead of system default </s> remove ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17
ParentalEnabled bool `yaml:"parental_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
</s> add ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17
ParentalEnabled bool `yaml:"parental_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
ResolverAddress string // DNS server address | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a1b18776678ee894cd0b558cf8683845056a2dfa | dnsfilter/dnsfilter.go |
if len(c.ResolverAddress) != 0 {
resolverAddr = c.ResolverAddress
d.transport.DialContext = customDialContext
} | <mask> TLSHandshakeTimeout: 10 * time.Second,
<mask> ExpectContinueTimeout: 1 * time.Second,
<mask> }
<mask> d.client = http.Client{
<mask> Transport: d.transport,
<mask> Timeout: defaultHTTPTimeout,
<mask> }
<mask> d.safeBrowsingServer = defaultSafebrowsingServer
</s> + parental, safesearch: use our own DNS resolver instead of system default </s> remove ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17
ParentalEnabled bool `yaml:"parental_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
</s> add ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17
ParentalEnabled bool `yaml:"parental_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
ResolverAddress string // DNS server address | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a1b18776678ee894cd0b558cf8683845056a2dfa | dnsfilter/dnsfilter.go |
github.com/AdguardTeam/dnsproxy v0.35.3 | <mask>
<mask> go 1.14
<mask>
<mask> require (
<mask> github.com/AdguardTeam/dnsproxy v0.33.9
<mask> github.com/AdguardTeam/golibs v0.4.4
<mask> github.com/AdguardTeam/urlfilter v0.14.3
<mask> github.com/NYTimes/gziphandler v1.1.1
<mask> github.com/ameshkov/dnscrypt/v2 v2.0.1
<mask> github.com/digineo/go-ipset/v2 v2.2.1
</s> Pull request: 2600 inconsistent response
Merge in DNS/adguard-home from 2600-upd-dnsproxy to master
Closes #2600.
Squashed commit of the following:
commit 4b1515395841f14d86bc85b5c516d14919b5dc25
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 18:39:19 2021 +0300
all: upd dnsproxy again, log changes
commit 8a866201f140655b0d2f58552a7ad9bcae91a173
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 14:53:48 2021 +0300
all: cleanup
commit ae81234c79a6dbc61cccbae9c1b9d0144bb7f506
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 14:49:28 2021 +0300
all: fix deps
commit 662384c366feaf553d9eba2b5e3be93774631ec5
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 13:58:26 2021 +0300
all: upd dnsproxy version, fix functions' signatures </s> remove github.com/AdguardTeam/dnsproxy v0.33.9 h1:HUwywkhUV/M73E7qWcBAF+SdsNq742s82Lvox4pr/tM=
github.com/AdguardTeam/dnsproxy v0.33.9/go.mod h1:dkI9VWh43XlOzF2XogDm1EmoVl7PANOR4isQV6X9LZs=
</s> add github.com/AdguardTeam/dnsproxy v0.35.3 h1:mvXWoIZRRATJQyGTnq0O1ofbvuVMKRZMyycU/2tFiyE=
github.com/AdguardTeam/dnsproxy v0.35.3/go.mod h1:dkI9VWh43XlOzF2XogDm1EmoVl7PANOR4isQV6X9LZs= </s> remove r, err := upstream.NewResolver("127.0.0.1:5354", 3*time.Second)
</s> add r, err := upstream.NewResolver("127.0.0.1:5354", upstream.Options{Timeout: 3 * time.Second}) </s> remove config, err := proxy.ParseUpstreamsConfig(c.Upstreams, config.DNS.BootstrapDNS, dnsforward.DefaultTimeout)
</s> add config, err := proxy.ParseUpstreamsConfig(c.Upstreams,
upstream.Options{
Bootstrap: config.DNS.BootstrapDNS,
Timeout: dnsforward.DefaultTimeout,
},
) </s> remove _, err := proxy.ParseUpstreamsConfig(upstreams, []string{}, DefaultTimeout)
</s> add _, err := proxy.ParseUpstreamsConfig(upstreams,
upstream.Options{
Bootstrap: []string{},
Timeout: DefaultTimeout,
},
) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a234b63da10eaae84e2854b3874dc8bc97bd3042 | go.mod |
github.com/AdguardTeam/dnsproxy v0.35.3 h1:mvXWoIZRRATJQyGTnq0O1ofbvuVMKRZMyycU/2tFiyE=
github.com/AdguardTeam/dnsproxy v0.35.3/go.mod h1:dkI9VWh43XlOzF2XogDm1EmoVl7PANOR4isQV6X9LZs= | <mask> dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU=
<mask> dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4=
<mask> dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU=
<mask> git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg=
<mask> github.com/AdguardTeam/dnsproxy v0.33.9 h1:HUwywkhUV/M73E7qWcBAF+SdsNq742s82Lvox4pr/tM=
<mask> github.com/AdguardTeam/dnsproxy v0.33.9/go.mod h1:dkI9VWh43XlOzF2XogDm1EmoVl7PANOR4isQV6X9LZs=
<mask> github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/golibs v0.4.2 h1:7M28oTZFoFwNmp8eGPb3ImmYbxGaJLyQXeIFVHjME0o=
<mask> github.com/AdguardTeam/golibs v0.4.2/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/golibs v0.4.4 h1:cM9UySQiYFW79zo5XRwnaIWVzfW4eNXmZktMrWbthpw=
<mask> github.com/AdguardTeam/golibs v0.4.4/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
</s> Pull request: 2600 inconsistent response
Merge in DNS/adguard-home from 2600-upd-dnsproxy to master
Closes #2600.
Squashed commit of the following:
commit 4b1515395841f14d86bc85b5c516d14919b5dc25
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 18:39:19 2021 +0300
all: upd dnsproxy again, log changes
commit 8a866201f140655b0d2f58552a7ad9bcae91a173
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 14:53:48 2021 +0300
all: cleanup
commit ae81234c79a6dbc61cccbae9c1b9d0144bb7f506
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 14:49:28 2021 +0300
all: fix deps
commit 662384c366feaf553d9eba2b5e3be93774631ec5
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 13:58:26 2021 +0300
all: upd dnsproxy version, fix functions' signatures </s> remove github.com/AdguardTeam/dnsproxy v0.33.9
</s> add github.com/AdguardTeam/dnsproxy v0.35.3 </s> remove r, err := upstream.NewResolver("127.0.0.1:5354", 3*time.Second)
</s> add r, err := upstream.NewResolver("127.0.0.1:5354", upstream.Options{Timeout: 3 * time.Second}) </s> remove config, err := proxy.ParseUpstreamsConfig(c.Upstreams, config.DNS.BootstrapDNS, dnsforward.DefaultTimeout)
</s> add config, err := proxy.ParseUpstreamsConfig(c.Upstreams,
upstream.Options{
Bootstrap: config.DNS.BootstrapDNS,
Timeout: dnsforward.DefaultTimeout,
},
) </s> remove _, err := proxy.ParseUpstreamsConfig(upstreams, []string{}, DefaultTimeout)
</s> add _, err := proxy.ParseUpstreamsConfig(upstreams,
upstream.Options{
Bootstrap: []string{},
Timeout: DefaultTimeout,
},
) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a234b63da10eaae84e2854b3874dc8bc97bd3042 | go.sum |
upstreamConfig, err := proxy.ParseUpstreamsConfig(upstreams,
upstream.Options{
Bootstrap: s.conf.BootstrapDNS,
Timeout: DefaultTimeout,
},
) | <mask> } else {
<mask> upstreams = s.conf.UpstreamDNS
<mask> }
<mask> upstreams = filterOutComments(upstreams)
<mask> upstreamConfig, err := proxy.ParseUpstreamsConfig(upstreams, s.conf.BootstrapDNS, DefaultTimeout)
<mask> if err != nil {
<mask> return fmt.Errorf("dns: proxy.ParseUpstreamsConfig: %w", err)
<mask> }
<mask>
<mask> if len(upstreamConfig.Upstreams) == 0 {
</s> Pull request: 2600 inconsistent response
Merge in DNS/adguard-home from 2600-upd-dnsproxy to master
Closes #2600.
Squashed commit of the following:
commit 4b1515395841f14d86bc85b5c516d14919b5dc25
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 18:39:19 2021 +0300
all: upd dnsproxy again, log changes
commit 8a866201f140655b0d2f58552a7ad9bcae91a173
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 14:53:48 2021 +0300
all: cleanup
commit ae81234c79a6dbc61cccbae9c1b9d0144bb7f506
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 14:49:28 2021 +0300
all: fix deps
commit 662384c366feaf553d9eba2b5e3be93774631ec5
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 13:58:26 2021 +0300
all: upd dnsproxy version, fix functions' signatures </s> remove uc, err := proxy.ParseUpstreamsConfig(defaultDNS, s.conf.BootstrapDNS, DefaultTimeout)
</s> add uc, err := proxy.ParseUpstreamsConfig(defaultDNS,
upstream.Options{
Bootstrap: s.conf.BootstrapDNS,
Timeout: DefaultTimeout,
},
) </s> remove _, err := proxy.ParseUpstreamsConfig(upstreams, []string{}, DefaultTimeout)
</s> add _, err := proxy.ParseUpstreamsConfig(upstreams,
upstream.Options{
Bootstrap: []string{},
Timeout: DefaultTimeout,
},
) </s> remove if _, err := upstream.NewResolver(boot, 0); err != nil {
</s> add if _, err := upstream.NewResolver(boot, upstream.Options{Timeout: 0}); err != nil { </s> remove config, err := proxy.ParseUpstreamsConfig(c.Upstreams, config.DNS.BootstrapDNS, dnsforward.DefaultTimeout)
</s> add config, err := proxy.ParseUpstreamsConfig(c.Upstreams,
upstream.Options{
Bootstrap: config.DNS.BootstrapDNS,
Timeout: dnsforward.DefaultTimeout,
},
) </s> remove r, err := upstream.NewResolver("127.0.0.1:5354", 3*time.Second)
</s> add r, err := upstream.NewResolver("127.0.0.1:5354", upstream.Options{Timeout: 3 * time.Second}) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a234b63da10eaae84e2854b3874dc8bc97bd3042 | internal/dnsforward/config.go |
uc, err := proxy.ParseUpstreamsConfig(defaultDNS,
upstream.Options{
Bootstrap: s.conf.BootstrapDNS,
Timeout: DefaultTimeout,
},
) | <mask> }
<mask>
<mask> if len(upstreamConfig.Upstreams) == 0 {
<mask> log.Info("warning: no default upstream servers specified, using %v", defaultDNS)
<mask> uc, err := proxy.ParseUpstreamsConfig(defaultDNS, s.conf.BootstrapDNS, DefaultTimeout)
<mask> if err != nil {
<mask> return fmt.Errorf("dns: failed to parse default upstreams: %v", err)
<mask> }
<mask> upstreamConfig.Upstreams = uc.Upstreams
<mask> }
</s> Pull request: 2600 inconsistent response
Merge in DNS/adguard-home from 2600-upd-dnsproxy to master
Closes #2600.
Squashed commit of the following:
commit 4b1515395841f14d86bc85b5c516d14919b5dc25
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 18:39:19 2021 +0300
all: upd dnsproxy again, log changes
commit 8a866201f140655b0d2f58552a7ad9bcae91a173
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 14:53:48 2021 +0300
all: cleanup
commit ae81234c79a6dbc61cccbae9c1b9d0144bb7f506
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 14:49:28 2021 +0300
all: fix deps
commit 662384c366feaf553d9eba2b5e3be93774631ec5
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 13:58:26 2021 +0300
all: upd dnsproxy version, fix functions' signatures </s> remove upstreamConfig, err := proxy.ParseUpstreamsConfig(upstreams, s.conf.BootstrapDNS, DefaultTimeout)
</s> add upstreamConfig, err := proxy.ParseUpstreamsConfig(upstreams,
upstream.Options{
Bootstrap: s.conf.BootstrapDNS,
Timeout: DefaultTimeout,
},
) </s> remove _, err := proxy.ParseUpstreamsConfig(upstreams, []string{}, DefaultTimeout)
</s> add _, err := proxy.ParseUpstreamsConfig(upstreams,
upstream.Options{
Bootstrap: []string{},
Timeout: DefaultTimeout,
},
) </s> remove if _, err := upstream.NewResolver(boot, 0); err != nil {
</s> add if _, err := upstream.NewResolver(boot, upstream.Options{Timeout: 0}); err != nil { </s> remove config, err := proxy.ParseUpstreamsConfig(c.Upstreams, config.DNS.BootstrapDNS, dnsforward.DefaultTimeout)
</s> add config, err := proxy.ParseUpstreamsConfig(c.Upstreams,
upstream.Options{
Bootstrap: config.DNS.BootstrapDNS,
Timeout: dnsforward.DefaultTimeout,
},
) </s> remove r, err := upstream.NewResolver("127.0.0.1:5354", 3*time.Second)
</s> add r, err := upstream.NewResolver("127.0.0.1:5354", upstream.Options{Timeout: 3 * time.Second}) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a234b63da10eaae84e2854b3874dc8bc97bd3042 | internal/dnsforward/config.go |
if _, err := upstream.NewResolver(boot, upstream.Options{Timeout: 0}); err != nil { | <mask> if boot == "" {
<mask> return boot, fmt.Errorf("invalid bootstrap server address: empty")
<mask> }
<mask>
<mask> if _, err := upstream.NewResolver(boot, 0); err != nil {
<mask> return boot, fmt.Errorf("invalid bootstrap server address: %w", err)
<mask> }
<mask> }
<mask>
<mask> return "", nil
</s> Pull request: 2600 inconsistent response
Merge in DNS/adguard-home from 2600-upd-dnsproxy to master
Closes #2600.
Squashed commit of the following:
commit 4b1515395841f14d86bc85b5c516d14919b5dc25
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 18:39:19 2021 +0300
all: upd dnsproxy again, log changes
commit 8a866201f140655b0d2f58552a7ad9bcae91a173
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 14:53:48 2021 +0300
all: cleanup
commit ae81234c79a6dbc61cccbae9c1b9d0144bb7f506
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 14:49:28 2021 +0300
all: fix deps
commit 662384c366feaf553d9eba2b5e3be93774631ec5
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 13:58:26 2021 +0300
all: upd dnsproxy version, fix functions' signatures </s> remove _, err := proxy.ParseUpstreamsConfig(upstreams, []string{}, DefaultTimeout)
</s> add _, err := proxy.ParseUpstreamsConfig(upstreams,
upstream.Options{
Bootstrap: []string{},
Timeout: DefaultTimeout,
},
) </s> remove upstreamConfig, err := proxy.ParseUpstreamsConfig(upstreams, s.conf.BootstrapDNS, DefaultTimeout)
</s> add upstreamConfig, err := proxy.ParseUpstreamsConfig(upstreams,
upstream.Options{
Bootstrap: s.conf.BootstrapDNS,
Timeout: DefaultTimeout,
},
) </s> remove config, err := proxy.ParseUpstreamsConfig(c.Upstreams, config.DNS.BootstrapDNS, dnsforward.DefaultTimeout)
</s> add config, err := proxy.ParseUpstreamsConfig(c.Upstreams,
upstream.Options{
Bootstrap: config.DNS.BootstrapDNS,
Timeout: dnsforward.DefaultTimeout,
},
) </s> remove uc, err := proxy.ParseUpstreamsConfig(defaultDNS, s.conf.BootstrapDNS, DefaultTimeout)
</s> add uc, err := proxy.ParseUpstreamsConfig(defaultDNS,
upstream.Options{
Bootstrap: s.conf.BootstrapDNS,
Timeout: DefaultTimeout,
},
) </s> remove r, err := upstream.NewResolver("127.0.0.1:5354", 3*time.Second)
</s> add r, err := upstream.NewResolver("127.0.0.1:5354", upstream.Options{Timeout: 3 * time.Second}) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a234b63da10eaae84e2854b3874dc8bc97bd3042 | internal/dnsforward/http.go |
_, err := proxy.ParseUpstreamsConfig(upstreams,
upstream.Options{
Bootstrap: []string{},
Timeout: DefaultTimeout,
},
) | <mask> if len(upstreams) == 0 {
<mask> return nil
<mask> }
<mask>
<mask> _, err := proxy.ParseUpstreamsConfig(upstreams, []string{}, DefaultTimeout)
<mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> var defaultUpstreamFound bool
</s> Pull request: 2600 inconsistent response
Merge in DNS/adguard-home from 2600-upd-dnsproxy to master
Closes #2600.
Squashed commit of the following:
commit 4b1515395841f14d86bc85b5c516d14919b5dc25
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 18:39:19 2021 +0300
all: upd dnsproxy again, log changes
commit 8a866201f140655b0d2f58552a7ad9bcae91a173
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 14:53:48 2021 +0300
all: cleanup
commit ae81234c79a6dbc61cccbae9c1b9d0144bb7f506
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 14:49:28 2021 +0300
all: fix deps
commit 662384c366feaf553d9eba2b5e3be93774631ec5
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 13:58:26 2021 +0300
all: upd dnsproxy version, fix functions' signatures </s> remove if _, err := upstream.NewResolver(boot, 0); err != nil {
</s> add if _, err := upstream.NewResolver(boot, upstream.Options{Timeout: 0}); err != nil { </s> remove upstreamConfig, err := proxy.ParseUpstreamsConfig(upstreams, s.conf.BootstrapDNS, DefaultTimeout)
</s> add upstreamConfig, err := proxy.ParseUpstreamsConfig(upstreams,
upstream.Options{
Bootstrap: s.conf.BootstrapDNS,
Timeout: DefaultTimeout,
},
) </s> remove config, err := proxy.ParseUpstreamsConfig(c.Upstreams, config.DNS.BootstrapDNS, dnsforward.DefaultTimeout)
</s> add config, err := proxy.ParseUpstreamsConfig(c.Upstreams,
upstream.Options{
Bootstrap: config.DNS.BootstrapDNS,
Timeout: dnsforward.DefaultTimeout,
},
) </s> remove uc, err := proxy.ParseUpstreamsConfig(defaultDNS, s.conf.BootstrapDNS, DefaultTimeout)
</s> add uc, err := proxy.ParseUpstreamsConfig(defaultDNS,
upstream.Options{
Bootstrap: s.conf.BootstrapDNS,
Timeout: DefaultTimeout,
},
) </s> remove r, err := upstream.NewResolver("127.0.0.1:5354", 3*time.Second)
</s> add r, err := upstream.NewResolver("127.0.0.1:5354", upstream.Options{Timeout: 3 * time.Second}) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a234b63da10eaae84e2854b3874dc8bc97bd3042 | internal/dnsforward/http.go |
"github.com/AdguardTeam/dnsproxy/upstream" | <mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsforward"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/util"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/AdguardTeam/golibs/utils"
<mask> )
<mask>
<mask> const clientsUpdatePeriod = 10 * time.Minute
</s> Pull request: 2600 inconsistent response
Merge in DNS/adguard-home from 2600-upd-dnsproxy to master
Closes #2600.
Squashed commit of the following:
commit 4b1515395841f14d86bc85b5c516d14919b5dc25
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 18:39:19 2021 +0300
all: upd dnsproxy again, log changes
commit 8a866201f140655b0d2f58552a7ad9bcae91a173
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 14:53:48 2021 +0300
all: cleanup
commit ae81234c79a6dbc61cccbae9c1b9d0144bb7f506
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 14:49:28 2021 +0300
all: fix deps
commit 662384c366feaf553d9eba2b5e3be93774631ec5
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 13:58:26 2021 +0300
all: upd dnsproxy version, fix functions' signatures </s> remove r, err := upstream.NewResolver("127.0.0.1:5354", 3*time.Second)
</s> add r, err := upstream.NewResolver("127.0.0.1:5354", upstream.Options{Timeout: 3 * time.Second}) </s> remove upstreamConfig, err := proxy.ParseUpstreamsConfig(upstreams, s.conf.BootstrapDNS, DefaultTimeout)
</s> add upstreamConfig, err := proxy.ParseUpstreamsConfig(upstreams,
upstream.Options{
Bootstrap: s.conf.BootstrapDNS,
Timeout: DefaultTimeout,
},
) </s> remove config, err := proxy.ParseUpstreamsConfig(c.Upstreams, config.DNS.BootstrapDNS, dnsforward.DefaultTimeout)
</s> add config, err := proxy.ParseUpstreamsConfig(c.Upstreams,
upstream.Options{
Bootstrap: config.DNS.BootstrapDNS,
Timeout: dnsforward.DefaultTimeout,
},
) </s> remove uc, err := proxy.ParseUpstreamsConfig(defaultDNS, s.conf.BootstrapDNS, DefaultTimeout)
</s> add uc, err := proxy.ParseUpstreamsConfig(defaultDNS,
upstream.Options{
Bootstrap: s.conf.BootstrapDNS,
Timeout: DefaultTimeout,
},
) </s> remove _, err := proxy.ParseUpstreamsConfig(upstreams, []string{}, DefaultTimeout)
</s> add _, err := proxy.ParseUpstreamsConfig(upstreams,
upstream.Options{
Bootstrap: []string{},
Timeout: DefaultTimeout,
},
) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a234b63da10eaae84e2854b3874dc8bc97bd3042 | internal/home/clients.go |
config, err := proxy.ParseUpstreamsConfig(c.Upstreams,
upstream.Options{
Bootstrap: config.DNS.BootstrapDNS,
Timeout: dnsforward.DefaultTimeout,
},
) | <mask> return nil
<mask> }
<mask>
<mask> if c.upstreamConfig == nil {
<mask> config, err := proxy.ParseUpstreamsConfig(c.Upstreams, config.DNS.BootstrapDNS, dnsforward.DefaultTimeout)
<mask> if err == nil {
<mask> c.upstreamConfig = &config
<mask> }
<mask> }
<mask>
</s> Pull request: 2600 inconsistent response
Merge in DNS/adguard-home from 2600-upd-dnsproxy to master
Closes #2600.
Squashed commit of the following:
commit 4b1515395841f14d86bc85b5c516d14919b5dc25
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 18:39:19 2021 +0300
all: upd dnsproxy again, log changes
commit 8a866201f140655b0d2f58552a7ad9bcae91a173
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 14:53:48 2021 +0300
all: cleanup
commit ae81234c79a6dbc61cccbae9c1b9d0144bb7f506
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 14:49:28 2021 +0300
all: fix deps
commit 662384c366feaf553d9eba2b5e3be93774631ec5
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 13:58:26 2021 +0300
all: upd dnsproxy version, fix functions' signatures </s> remove if _, err := upstream.NewResolver(boot, 0); err != nil {
</s> add if _, err := upstream.NewResolver(boot, upstream.Options{Timeout: 0}); err != nil { </s> remove _, err := proxy.ParseUpstreamsConfig(upstreams, []string{}, DefaultTimeout)
</s> add _, err := proxy.ParseUpstreamsConfig(upstreams,
upstream.Options{
Bootstrap: []string{},
Timeout: DefaultTimeout,
},
) </s> remove upstreamConfig, err := proxy.ParseUpstreamsConfig(upstreams, s.conf.BootstrapDNS, DefaultTimeout)
</s> add upstreamConfig, err := proxy.ParseUpstreamsConfig(upstreams,
upstream.Options{
Bootstrap: s.conf.BootstrapDNS,
Timeout: DefaultTimeout,
},
) </s> remove uc, err := proxy.ParseUpstreamsConfig(defaultDNS, s.conf.BootstrapDNS, DefaultTimeout)
</s> add uc, err := proxy.ParseUpstreamsConfig(defaultDNS,
upstream.Options{
Bootstrap: s.conf.BootstrapDNS,
Timeout: DefaultTimeout,
},
) </s> remove r, err := upstream.NewResolver("127.0.0.1:5354", 3*time.Second)
</s> add r, err := upstream.NewResolver("127.0.0.1:5354", upstream.Options{Timeout: 3 * time.Second}) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a234b63da10eaae84e2854b3874dc8bc97bd3042 | internal/home/clients.go |
r, err := upstream.NewResolver("127.0.0.1:5354", upstream.Options{Timeout: 3 * time.Second}) | <mask> assert.Nilf(t, err, "%s", err)
<mask> assert.Equal(t, http.StatusOK, resp.StatusCode)
<mask>
<mask> // test DNS over UDP
<mask> r, err := upstream.NewResolver("127.0.0.1:5354", 3*time.Second)
<mask> assert.Nil(t, err)
<mask> addrs, err := r.LookupIPAddr(context.TODO(), "static.adguard.com")
<mask> assert.Nil(t, err)
<mask> haveIP := len(addrs) != 0
<mask> assert.True(t, haveIP)
</s> Pull request: 2600 inconsistent response
Merge in DNS/adguard-home from 2600-upd-dnsproxy to master
Closes #2600.
Squashed commit of the following:
commit 4b1515395841f14d86bc85b5c516d14919b5dc25
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 18:39:19 2021 +0300
all: upd dnsproxy again, log changes
commit 8a866201f140655b0d2f58552a7ad9bcae91a173
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 14:53:48 2021 +0300
all: cleanup
commit ae81234c79a6dbc61cccbae9c1b9d0144bb7f506
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 14:49:28 2021 +0300
all: fix deps
commit 662384c366feaf553d9eba2b5e3be93774631ec5
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 13:58:26 2021 +0300
all: upd dnsproxy version, fix functions' signatures </s> remove upstreamConfig, err := proxy.ParseUpstreamsConfig(upstreams, s.conf.BootstrapDNS, DefaultTimeout)
</s> add upstreamConfig, err := proxy.ParseUpstreamsConfig(upstreams,
upstream.Options{
Bootstrap: s.conf.BootstrapDNS,
Timeout: DefaultTimeout,
},
) </s> remove if _, err := upstream.NewResolver(boot, 0); err != nil {
</s> add if _, err := upstream.NewResolver(boot, upstream.Options{Timeout: 0}); err != nil { </s> remove uc, err := proxy.ParseUpstreamsConfig(defaultDNS, s.conf.BootstrapDNS, DefaultTimeout)
</s> add uc, err := proxy.ParseUpstreamsConfig(defaultDNS,
upstream.Options{
Bootstrap: s.conf.BootstrapDNS,
Timeout: DefaultTimeout,
},
) </s> remove _, err := proxy.ParseUpstreamsConfig(upstreams, []string{}, DefaultTimeout)
</s> add _, err := proxy.ParseUpstreamsConfig(upstreams,
upstream.Options{
Bootstrap: []string{},
Timeout: DefaultTimeout,
},
) </s> remove config, err := proxy.ParseUpstreamsConfig(c.Upstreams, config.DNS.BootstrapDNS, dnsforward.DefaultTimeout)
</s> add config, err := proxy.ParseUpstreamsConfig(c.Upstreams,
upstream.Options{
Bootstrap: config.DNS.BootstrapDNS,
Timeout: dnsforward.DefaultTimeout,
},
) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a234b63da10eaae84e2854b3874dc8bc97bd3042 | internal/home/home_test.go |
"github.com/AdguardTeam/golibs/file" | <mask> "github.com/AdguardTeam/AdGuardHome/dnsfilter"
<mask> "github.com/AdguardTeam/AdGuardHome/dnsforward"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> yaml "gopkg.in/yaml.v2"
<mask> )
<mask>
<mask> const (
</s> * use golibs v0.1.1: file.SafeWrite() </s> remove github.com/AdguardTeam/golibs v0.1.0
</s> add github.com/AdguardTeam/golibs v0.1.1 </s> remove // ----------------------------------
// helper functions for working with files
// ----------------------------------
// Writes data first to a temporary file and then renames it to what's specified in path
func safeWriteFile(path string, data []byte) error {
dir := filepath.Dir(path)
err := os.MkdirAll(dir, 0755)
if err != nil {
return err
}
tmpPath := path + ".tmp"
err = ioutil.WriteFile(tmpPath, data, 0644)
if err != nil {
return err
}
return os.Rename(tmpPath, path)
}
</s> add </s> remove err = safeWriteFile(configFile, body)
</s> add err = file.SafeWrite(configFile, body) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a2e9d6945200bce5f270fbe95dedd65a0d08b5e4 | config.go |
err = file.SafeWrite(configFile, yamlText) | <mask> if err != nil {
<mask> log.Error("Couldn't generate YAML file: %s", err)
<mask> return err
<mask> }
<mask> err = safeWriteFile(configFile, yamlText)
<mask> if err != nil {
<mask> log.Error("Couldn't save YAML config: %s", err)
<mask> return err
<mask> }
<mask>
</s> * use golibs v0.1.1: file.SafeWrite() </s> remove err = safeWriteFile(configFile, body)
</s> add err = file.SafeWrite(configFile, body) </s> remove // ----------------------------------
// helper functions for working with files
// ----------------------------------
// Writes data first to a temporary file and then renames it to what's specified in path
func safeWriteFile(path string, data []byte) error {
dir := filepath.Dir(path)
err := os.MkdirAll(dir, 0755)
if err != nil {
return err
}
tmpPath := path + ".tmp"
err = ioutil.WriteFile(tmpPath, data, 0644)
if err != nil {
return err
}
return os.Rename(tmpPath, path)
}
</s> add </s> remove err := safeWriteFile(filterFilePath, body)
</s> add err := file.SafeWrite(filterFilePath, body) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a2e9d6945200bce5f270fbe95dedd65a0d08b5e4 | config.go |
"github.com/AdguardTeam/golibs/file" | <mask> "strings"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/dnsfilter"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> )
<mask>
<mask> var (
<mask> nextFilterID = time.Now().Unix() // semi-stable way to generate an unique ID
<mask> filterTitleRegexp = regexp.MustCompile(`^! Title: +(.*)$`)
</s> * use golibs v0.1.1: file.SafeWrite() </s> remove err = safeWriteFile(configFile, body)
</s> add err = file.SafeWrite(configFile, body) </s> remove err = safeWriteFile(configFile, yamlText)
</s> add err = file.SafeWrite(configFile, yamlText) </s> remove // ----------------------------------
// helper functions for working with files
// ----------------------------------
// Writes data first to a temporary file and then renames it to what's specified in path
func safeWriteFile(path string, data []byte) error {
dir := filepath.Dir(path)
err := os.MkdirAll(dir, 0755)
if err != nil {
return err
}
tmpPath := path + ".tmp"
err = ioutil.WriteFile(tmpPath, data, 0644)
if err != nil {
return err
}
return os.Rename(tmpPath, path)
}
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a2e9d6945200bce5f270fbe95dedd65a0d08b5e4 | filter.go |
err := file.SafeWrite(filterFilePath, body) | <mask> filterFilePath := filter.Path()
<mask> log.Printf("Saving filter %d contents to: %s", filter.ID, filterFilePath)
<mask> body := []byte(strings.Join(filter.Rules, "\n"))
<mask>
<mask> err := safeWriteFile(filterFilePath, body)
<mask>
<mask> // update LastUpdated field after saving the file
<mask> filter.LastUpdated = filter.LastTimeUpdated()
<mask> return err
<mask> }
</s> * use golibs v0.1.1: file.SafeWrite() </s> remove // ----------------------------------
// helper functions for working with files
// ----------------------------------
// Writes data first to a temporary file and then renames it to what's specified in path
func safeWriteFile(path string, data []byte) error {
dir := filepath.Dir(path)
err := os.MkdirAll(dir, 0755)
if err != nil {
return err
}
tmpPath := path + ".tmp"
err = ioutil.WriteFile(tmpPath, data, 0644)
if err != nil {
return err
}
return os.Rename(tmpPath, path)
}
</s> add </s> remove err = safeWriteFile(configFile, body)
</s> add err = file.SafeWrite(configFile, body) </s> remove err = safeWriteFile(configFile, yamlText)
</s> add err = file.SafeWrite(configFile, yamlText) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a2e9d6945200bce5f270fbe95dedd65a0d08b5e4 | filter.go |
github.com/AdguardTeam/golibs v0.1.1 | <mask> go 1.12
<mask>
<mask> require (
<mask> github.com/AdguardTeam/dnsproxy v0.11.2
<mask> github.com/AdguardTeam/golibs v0.1.0
<mask> github.com/StackExchange/wmi v0.0.0-20180725035823-b12b22c5341f // indirect
<mask> github.com/bluele/gcache v0.0.0-20171010155617-472614239ac7
<mask> github.com/go-ole/go-ole v1.2.1 // indirect
<mask> github.com/go-test/deep v1.0.1
<mask> github.com/gobuffalo/packr v1.19.0
</s> * use golibs v0.1.1: file.SafeWrite() </s> remove github.com/AdguardTeam/golibs v0.1.0 h1:Mo1QNKC8eSbqczhxfdBXYCrUMwvgCyCwZFyWv+2Gdng=
</s> add </s> remove // ----------------------------------
// helper functions for working with files
// ----------------------------------
// Writes data first to a temporary file and then renames it to what's specified in path
func safeWriteFile(path string, data []byte) error {
dir := filepath.Dir(path)
err := os.MkdirAll(dir, 0755)
if err != nil {
return err
}
tmpPath := path + ".tmp"
err = ioutil.WriteFile(tmpPath, data, 0644)
if err != nil {
return err
}
return os.Rename(tmpPath, path)
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a2e9d6945200bce5f270fbe95dedd65a0d08b5e4 | go.mod |
<mask> github.com/AdguardTeam/dnsproxy v0.11.2 h1:S/Ag2q9qoZsmW1fvMohPZP7/5amEtz8NmFCp8kxUalQ=
<mask> github.com/AdguardTeam/dnsproxy v0.11.2/go.mod h1:EPp92b5cYR7HZpO+OQu6xC7AyhUoBaXW3sfa3exq/0I=
<mask> github.com/AdguardTeam/golibs v0.1.0 h1:Mo1QNKC8eSbqczhxfdBXYCrUMwvgCyCwZFyWv+2Gdng=
<mask> github.com/AdguardTeam/golibs v0.1.0/go.mod h1:zhi6xGwK4cMpjDocybhhLgvcGkstiSIjlpKbvyxC5Yc=
<mask> github.com/StackExchange/wmi v0.0.0-20180725035823-b12b22c5341f h1:5ZfJxyXo8KyX8DgGXC5B7ILL8y51fci/qYz2B4j8iLY=
<mask> github.com/StackExchange/wmi v0.0.0-20180725035823-b12b22c5341f/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
<mask> github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmHS9iAKVt9AyzRSqNU1qabPih5BY=
<mask> github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA=
</s> * use golibs v0.1.1: file.SafeWrite() </s> remove github.com/AdguardTeam/golibs v0.1.0
</s> add github.com/AdguardTeam/golibs v0.1.1 </s> remove err = safeWriteFile(configFile, body)
</s> add err = file.SafeWrite(configFile, body) </s> remove // ----------------------------------
// helper functions for working with files
// ----------------------------------
// Writes data first to a temporary file and then renames it to what's specified in path
func safeWriteFile(path string, data []byte) error {
dir := filepath.Dir(path)
err := os.MkdirAll(dir, 0755)
if err != nil {
return err
}
tmpPath := path + ".tmp"
err = ioutil.WriteFile(tmpPath, data, 0644)
if err != nil {
return err
}
return os.Rename(tmpPath, path)
}
</s> add | [
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a2e9d6945200bce5f270fbe95dedd65a0d08b5e4 | go.sum | |
github.com/AdguardTeam/golibs v0.1.1 h1:aepIN7yulf8I4Ub2c0cAaIizfSHPVXB2wrh8j4BJxl4=
github.com/AdguardTeam/golibs v0.1.1/go.mod h1:b0XkhgIcn2TxwX6C5AQMtpIFAgjPehNgxJErWkwA3ko= | <mask> github.com/AdguardTeam/dnsproxy v0.11.2 h1:S/Ag2q9qoZsmW1fvMohPZP7/5amEtz8NmFCp8kxUalQ=
<mask> github.com/AdguardTeam/dnsproxy v0.11.2/go.mod h1:EPp92b5cYR7HZpO+OQu6xC7AyhUoBaXW3sfa3exq/0I=
<mask> github.com/AdguardTeam/golibs v0.1.0/go.mod h1:zhi6xGwK4cMpjDocybhhLgvcGkstiSIjlpKbvyxC5Yc=
<mask> github.com/StackExchange/wmi v0.0.0-20180725035823-b12b22c5341f h1:5ZfJxyXo8KyX8DgGXC5B7ILL8y51fci/qYz2B4j8iLY=
<mask> github.com/StackExchange/wmi v0.0.0-20180725035823-b12b22c5341f/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
<mask> github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmHS9iAKVt9AyzRSqNU1qabPih5BY=
<mask> github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA=
</s> * use golibs v0.1.1: file.SafeWrite() </s> remove github.com/AdguardTeam/golibs v0.1.0 h1:Mo1QNKC8eSbqczhxfdBXYCrUMwvgCyCwZFyWv+2Gdng=
</s> add </s> remove github.com/AdguardTeam/golibs v0.1.0
</s> add github.com/AdguardTeam/golibs v0.1.1 </s> remove err = safeWriteFile(configFile, body)
</s> add err = file.SafeWrite(configFile, body) </s> remove // ----------------------------------
// helper functions for working with files
// ----------------------------------
// Writes data first to a temporary file and then renames it to what's specified in path
func safeWriteFile(path string, data []byte) error {
dir := filepath.Dir(path)
err := os.MkdirAll(dir, 0755)
if err != nil {
return err
}
tmpPath := path + ".tmp"
err = ioutil.WriteFile(tmpPath, data, 0644)
if err != nil {
return err
}
return os.Rename(tmpPath, path)
}
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a2e9d6945200bce5f270fbe95dedd65a0d08b5e4 | go.sum |
<mask> "bufio"
<mask> "errors"
<mask> "fmt"
<mask> "io"
<mask> "io/ioutil"
<mask> "net"
<mask> "net/http"
<mask> "net/url"
<mask> "os"
<mask> "path"
</s> * use golibs v0.1.1: file.SafeWrite() </s> remove err = safeWriteFile(configFile, body)
</s> add err = file.SafeWrite(configFile, body) </s> remove // ----------------------------------
// helper functions for working with files
// ----------------------------------
// Writes data first to a temporary file and then renames it to what's specified in path
func safeWriteFile(path string, data []byte) error {
dir := filepath.Dir(path)
err := os.MkdirAll(dir, 0755)
if err != nil {
return err
}
tmpPath := path + ".tmp"
err = ioutil.WriteFile(tmpPath, data, 0644)
if err != nil {
return err
}
return os.Rename(tmpPath, path)
}
</s> add </s> remove github.com/AdguardTeam/golibs v0.1.0 h1:Mo1QNKC8eSbqczhxfdBXYCrUMwvgCyCwZFyWv+2Gdng=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a2e9d6945200bce5f270fbe95dedd65a0d08b5e4 | helpers.go | |
<mask>
<mask> "github.com/joomcode/errorx"
<mask> )
<mask>
<mask> // ----------------------------------
<mask> // helper functions for working with files
<mask> // ----------------------------------
<mask>
<mask> // Writes data first to a temporary file and then renames it to what's specified in path
<mask> func safeWriteFile(path string, data []byte) error {
<mask> dir := filepath.Dir(path)
<mask> err := os.MkdirAll(dir, 0755)
<mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> tmpPath := path + ".tmp"
<mask> err = ioutil.WriteFile(tmpPath, data, 0644)
<mask> if err != nil {
<mask> return err
<mask> }
<mask> return os.Rename(tmpPath, path)
<mask> }
<mask>
<mask> // ----------------------------------
<mask> // helper functions for HTTP handlers
<mask> // ----------------------------------
<mask> func ensure(method string, handler func(http.ResponseWriter, *http.Request)) func(http.ResponseWriter, *http.Request) {
<mask> return func(w http.ResponseWriter, r *http.Request) {
</s> * use golibs v0.1.1: file.SafeWrite() </s> remove err = safeWriteFile(configFile, yamlText)
</s> add err = file.SafeWrite(configFile, yamlText) </s> remove err = safeWriteFile(configFile, body)
</s> add err = file.SafeWrite(configFile, body) </s> remove err := safeWriteFile(filterFilePath, body)
</s> add err := file.SafeWrite(filterFilePath, body) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep"... | https://github.com/AdguardTeam/AdGuardHome/commit/a2e9d6945200bce5f270fbe95dedd65a0d08b5e4 | helpers.go | |
"github.com/AdguardTeam/golibs/file" | <mask> "path/filepath"
<mask>
<mask> "github.com/AdguardTeam/golibs/log"
<mask> yaml "gopkg.in/yaml.v2"
<mask> )
<mask>
<mask> const currentSchemaVersion = 3 // used for upgrading from old configs to new config
<mask>
</s> * use golibs v0.1.1: file.SafeWrite() </s> remove // ----------------------------------
// helper functions for working with files
// ----------------------------------
// Writes data first to a temporary file and then renames it to what's specified in path
func safeWriteFile(path string, data []byte) error {
dir := filepath.Dir(path)
err := os.MkdirAll(dir, 0755)
if err != nil {
return err
}
tmpPath := path + ".tmp"
err = ioutil.WriteFile(tmpPath, data, 0644)
if err != nil {
return err
}
return os.Rename(tmpPath, path)
}
</s> add </s> remove err = safeWriteFile(configFile, body)
</s> add err = file.SafeWrite(configFile, body) </s> remove err = safeWriteFile(configFile, yamlText)
</s> add err = file.SafeWrite(configFile, yamlText) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a2e9d6945200bce5f270fbe95dedd65a0d08b5e4 | upgrade.go |
err = file.SafeWrite(configFile, body) | <mask> log.Printf("Couldn't generate YAML file: %s", err)
<mask> return err
<mask> }
<mask>
<mask> err = safeWriteFile(configFile, body)
<mask> if err != nil {
<mask> log.Printf("Couldn't save YAML config: %s", err)
<mask> return err
<mask> }
<mask>
</s> * use golibs v0.1.1: file.SafeWrite() </s> remove err = safeWriteFile(configFile, yamlText)
</s> add err = file.SafeWrite(configFile, yamlText) </s> remove // ----------------------------------
// helper functions for working with files
// ----------------------------------
// Writes data first to a temporary file and then renames it to what's specified in path
func safeWriteFile(path string, data []byte) error {
dir := filepath.Dir(path)
err := os.MkdirAll(dir, 0755)
if err != nil {
return err
}
tmpPath := path + ".tmp"
err = ioutil.WriteFile(tmpPath, data, 0644)
if err != nil {
return err
}
return os.Rename(tmpPath, path)
}
</s> add </s> remove err := safeWriteFile(filterFilePath, body)
</s> add err := file.SafeWrite(filterFilePath, body) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a2e9d6945200bce5f270fbe95dedd65a0d08b5e4 | upgrade.go |
qType := d.Req.Question[0].Qtype
if qType != dns.TypeA && qType != dns.TypeAAAA {
return | <mask> }
<mask> }
<mask>
<mask> func onDNSRequest(d *proxy.DNSContext) {
<mask> if d.Req.Question[0].Qtype == dns.TypeA {
<mask> ip, _, _ := net.SplitHostPort(d.Addr.String())
<mask> beginAsyncRDNS(ip)
<mask> }
<mask> }
<mask>
<mask> func generateServerConfig() dnsforward.ServerConfig {
<mask> filters := []dnsfilter.Filter{}
</s> Fix #706 -- rDNS for DOH/DOT clients </s> remove
// getIPString is a helper function that extracts IP address from net.Addr
func getIPString(addr net.Addr) string {
switch addr := addr.(type) {
case *net.UDPAddr:
return addr.IP.String()
case *net.TCPAddr:
return addr.IP.String()
}
return ""
}
</s> add </s> remove import "testing"
</s> add import (
"testing"
) </s> remove ip := getIPString(addr)
</s> add ip := GetIPString(addr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3b8d4d9237fcd726b7e4edfc729bd156efc1323 | dns.go |
ip := dnsforward.GetIPString(d.Addr)
if ip == "" {
// This would be quite weird if we get here
return
}
beginAsyncRDNS(ip) | <mask> return
<mask> }
<mask> }
<mask>
<mask> func generateServerConfig() dnsforward.ServerConfig {
<mask> filters := []dnsfilter.Filter{}
<mask> userFilter := userFilter()
</s> Fix #706 -- rDNS for DOH/DOT clients </s> remove if d.Req.Question[0].Qtype == dns.TypeA {
ip, _, _ := net.SplitHostPort(d.Addr.String())
beginAsyncRDNS(ip)
</s> add qType := d.Req.Question[0].Qtype
if qType != dns.TypeA && qType != dns.TypeAAAA {
return </s> remove
// getIPString is a helper function that extracts IP address from net.Addr
func getIPString(addr net.Addr) string {
switch addr := addr.(type) {
case *net.UDPAddr:
return addr.IP.String()
case *net.TCPAddr:
return addr.IP.String()
}
return ""
}
</s> add </s> remove import "testing"
</s> add import (
"testing"
) </s> remove ip := getIPString(addr)
</s> add ip := GetIPString(addr) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3b8d4d9237fcd726b7e4edfc729bd156efc1323 | dns.go |
import (
"testing"
) | <mask> package main
<mask>
<mask> import "testing"
<mask>
<mask> func TestResolveRDNS(t *testing.T) {
<mask> config.DNS.BindHost = "1.1.1.1"
<mask> initDNSServer(".")
<mask> if r := resolveRDNS("1.1.1.1"); r != "one.one.one.one" {
</s> Fix #706 -- rDNS for DOH/DOT clients </s> remove if d.Req.Question[0].Qtype == dns.TypeA {
ip, _, _ := net.SplitHostPort(d.Addr.String())
beginAsyncRDNS(ip)
</s> add qType := d.Req.Question[0].Qtype
if qType != dns.TypeA && qType != dns.TypeAAAA {
return </s> remove ip := getIPString(addr)
</s> add ip := GetIPString(addr) </s> remove
// getIPString is a helper function that extracts IP address from net.Addr
func getIPString(addr net.Addr) string {
switch addr := addr.(type) {
case *net.UDPAddr:
return addr.IP.String()
case *net.TCPAddr:
return addr.IP.String()
}
return ""
}
</s> add | [
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3b8d4d9237fcd726b7e4edfc729bd156efc1323 | dns_test.go |
ip := GetIPString(addr) | <mask> func (l *queryLog) logRequest(question *dns.Msg, answer *dns.Msg, result *dnsfilter.Result, elapsed time.Duration, addr net.Addr, upstream string) *logEntry {
<mask> var q []byte
<mask> var a []byte
<mask> var err error
<mask> ip := getIPString(addr)
<mask>
<mask> if question != nil {
<mask> q, err = question.Pack()
<mask> if err != nil {
<mask> log.Printf("failed to pack question for querylog: %s", err)
</s> Fix #706 -- rDNS for DOH/DOT clients </s> remove if d.Req.Question[0].Qtype == dns.TypeA {
ip, _, _ := net.SplitHostPort(d.Addr.String())
beginAsyncRDNS(ip)
</s> add qType := d.Req.Question[0].Qtype
if qType != dns.TypeA && qType != dns.TypeAAAA {
return </s> remove import "testing"
</s> add import (
"testing"
) </s> remove
// getIPString is a helper function that extracts IP address from net.Addr
func getIPString(addr net.Addr) string {
switch addr := addr.(type) {
case *net.UDPAddr:
return addr.IP.String()
case *net.TCPAddr:
return addr.IP.String()
}
return ""
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3b8d4d9237fcd726b7e4edfc729bd156efc1323 | dnsforward/querylog.go |
<mask> }
<mask>
<mask> return answers
<mask> }
<mask>
<mask> // getIPString is a helper function that extracts IP address from net.Addr
<mask> func getIPString(addr net.Addr) string {
<mask> switch addr := addr.(type) {
<mask> case *net.UDPAddr:
<mask> return addr.IP.String()
<mask> case *net.TCPAddr:
<mask> return addr.IP.String()
<mask> }
<mask> return ""
<mask> }
</s> Fix #706 -- rDNS for DOH/DOT clients </s> remove if d.Req.Question[0].Qtype == dns.TypeA {
ip, _, _ := net.SplitHostPort(d.Addr.String())
beginAsyncRDNS(ip)
</s> add qType := d.Req.Question[0].Qtype
if qType != dns.TypeA && qType != dns.TypeAAAA {
return </s> remove ip := getIPString(addr)
</s> add ip := GetIPString(addr) </s> remove import "testing"
</s> add import (
"testing"
) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3b8d4d9237fcd726b7e4edfc729bd156efc1323 | dnsforward/querylog.go | |
<mask> package querylog
<mask>
<mask> import (
<mask> "fmt"
<mask> "io/ioutil"
<mask> "math/rand"
<mask> "net"
<mask> "os"
<mask> "runtime"
<mask> "sort"
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove "os"
"runtime"
</s> add </s> remove BaseDir: prepareTestDir(t),
</s> add BaseDir: aghtest.PrepareTestDir(t), </s> remove s, _ := createObject(conf)
e := Entry{}
e.Domain = "domain"
e.Client = "127.0.0.1"
e.Result = RFiltered
e.Time = 123456
s.Update(e)
e.Domain = "domain"
e.Client = "127.0.0.1"
e.Result = RNotFiltered
e.Time = 123456
s.Update(e)
</s> add s.Update(Entry{
Domain: "domain",
Client: "127.0.0.1",
Result: RFiltered,
Time: 123456,
})
s.Update(Entry{
Domain: "domain",
Client: "127.0.0.1",
Result: RNotFiltered,
Time: 123456,
}) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/querylog/qlog_test.go | |
<mask> "fmt"
<mask> "io/ioutil"
<mask> "math/rand"
<mask> "net"
<mask> "os"
<mask> "runtime"
<mask> "sort"
<mask> "testing"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/dnsproxy/proxyutil"
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove "io/ioutil"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/querylog/qlog_test.go | |
<mask> func TestMain(m *testing.M) {
<mask> aghtest.DiscardLogOutput(m)
<mask> }
<mask>
<mask> func prepareTestDir(t *testing.T) string {
<mask> t.Helper()
<mask>
<mask> wd, err := os.Getwd()
<mask> require.Nil(t, err)
<mask>
<mask> dir, err := ioutil.TempDir(wd, "agh-tests")
<mask> require.Nil(t, err)
<mask> require.NotEmpty(t, dir)
<mask>
<mask> t.Cleanup(func() {
<mask> // TODO(e.burkov): Replace with t.TempDir methods after updating
<mask> // go version to 1.15.
<mask> start := time.Now()
<mask> for {
<mask> err := os.RemoveAll(dir)
<mask> if err == nil {
<mask> break
<mask> }
<mask>
<mask> if runtime.GOOS != "windows" || time.Since(start) >= 500*time.Millisecond {
<mask> break
<mask> }
<mask> time.Sleep(5 * time.Millisecond)
<mask> }
<mask>
<mask> assert.Nil(t, err)
<mask> })
<mask>
<mask> return dir
<mask> }
<mask>
<mask> // TestQueryLog tests adding and loading (with filtering) entries from disk and
<mask> // memory.
<mask> func TestQueryLog(t *testing.T) {
<mask> l := newQueryLog(Config{
<mask> Enabled: true,
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove func prepareTestDir() string {
const dir = "./agh-test"
_ = os.RemoveAll(dir)
_ = os.MkdirAll(dir, 0o755)
return dir
</s> add func prepareTestFile(t *testing.T) (f *os.File) {
t.Helper()
dir := aghtest.PrepareTestDir(t)
f, err := ioutil.TempFile(dir, "")
require.Nil(t, err)
require.NotNil(t, f)
t.Cleanup(func() {
assert.Nil(t, f.Close())
})
return f </s> remove if err != nil {
t.Fatalf("Cannot get net interfaces: %s", err)
}
if len(ifaces) == 0 {
t.Fatalf("No net interfaces found")
}
</s> add require.Nilf(t, err, "Cannot get net interfaces: %s", err)
require.NotEmpty(t, ifaces, "No net interfaces found") </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",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"re... | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/querylog/qlog_test.go | |
BaseDir: aghtest.PrepareTestDir(t), | <mask> Enabled: true,
<mask> FileEnabled: true,
<mask> Interval: 1,
<mask> MemSize: 100,
<mask> BaseDir: prepareTestDir(t),
<mask> })
<mask>
<mask> // Add disk entries.
<mask> addEntry(l, "example.org", net.IPv4(1, 1, 1, 1), net.IPv4(2, 2, 2, 1))
<mask> // Write to disk (first file).
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove BaseDir: prepareTestDir(t),
</s> add BaseDir: aghtest.PrepareTestDir(t), </s> remove BaseDir: prepareTestDir(t),
</s> add BaseDir: aghtest.PrepareTestDir(t), </s> remove BaseDir: prepareTestDir(t),
</s> add BaseDir: aghtest.PrepareTestDir(t), </s> remove func prepareTestDir(t *testing.T) string {
t.Helper()
wd, err := os.Getwd()
require.Nil(t, err)
dir, err := ioutil.TempDir(wd, "agh-tests")
require.Nil(t, err)
require.NotEmpty(t, dir)
t.Cleanup(func() {
// TODO(e.burkov): Replace with t.TempDir methods after updating
// go version to 1.15.
start := time.Now()
for {
err := os.RemoveAll(dir)
if err == nil {
break
}
if runtime.GOOS != "windows" || time.Since(start) >= 500*time.Millisecond {
break
}
time.Sleep(5 * time.Millisecond)
}
assert.Nil(t, err)
})
return dir
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/querylog/qlog_test.go |
BaseDir: aghtest.PrepareTestDir(t), | <mask> l := newQueryLog(Config{
<mask> Enabled: true,
<mask> Interval: 1,
<mask> MemSize: 100,
<mask> BaseDir: prepareTestDir(t),
<mask> })
<mask>
<mask> const (
<mask> entNum = 10
<mask> firstPageDomain = "first.example.org"
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove BaseDir: prepareTestDir(t),
</s> add BaseDir: aghtest.PrepareTestDir(t), </s> remove BaseDir: prepareTestDir(t),
</s> add BaseDir: aghtest.PrepareTestDir(t), </s> remove BaseDir: prepareTestDir(t),
</s> add BaseDir: aghtest.PrepareTestDir(t), </s> remove func prepareTestDir(t *testing.T) string {
t.Helper()
wd, err := os.Getwd()
require.Nil(t, err)
dir, err := ioutil.TempDir(wd, "agh-tests")
require.Nil(t, err)
require.NotEmpty(t, dir)
t.Cleanup(func() {
// TODO(e.burkov): Replace with t.TempDir methods after updating
// go version to 1.15.
start := time.Now()
for {
err := os.RemoveAll(dir)
if err == nil {
break
}
if runtime.GOOS != "windows" || time.Since(start) >= 500*time.Millisecond {
break
}
time.Sleep(5 * time.Millisecond)
}
assert.Nil(t, err)
})
return dir
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/querylog/qlog_test.go |
BaseDir: aghtest.PrepareTestDir(t), | <mask> Enabled: true,
<mask> FileEnabled: true,
<mask> Interval: 1,
<mask> MemSize: 100,
<mask> BaseDir: prepareTestDir(t),
<mask> })
<mask>
<mask> const entNum = 10
<mask> // Add entries to the log.
<mask> for i := 0; i < entNum; i++ {
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove BaseDir: prepareTestDir(t),
</s> add BaseDir: aghtest.PrepareTestDir(t), </s> remove BaseDir: prepareTestDir(t),
</s> add BaseDir: aghtest.PrepareTestDir(t), </s> remove BaseDir: prepareTestDir(t),
</s> add BaseDir: aghtest.PrepareTestDir(t), </s> remove s, _ := createObject(conf)
e := Entry{}
n := 1000 // number of distinct clients and domains every hour
for h := 0; h != 12; h++ {
if h != 0 {
atomic.AddInt32(&hour, 1)
}
for i := 0; i != n; i++ {
e.Domain = fmt.Sprintf("domain%d", i)
ip := net.IP{127, 0, 0, 1}
ip[2] = byte((i & 0xff00) >> 8)
ip[3] = byte(i & 0xff)
e.Client = ip.String()
e.Result = RNotFiltered
e.Time = 123456
s.Update(e)
</s> add // Number of distinct clients and domains every hour.
const n = 1000
for h := 0; h < 12; h++ {
atomic.AddInt32(&hour, 1)
for i := 0; i < n; i++ {
s.Update(Entry{
Domain: fmt.Sprintf("domain%d", i),
Client: net.IP{
127,
0,
byte((i & 0xff00) >> 8),
byte(i & 0xff),
}.String(),
Result: RNotFiltered,
Time: 123456,
}) </s> remove func TestAggregateDataPerTimeUnit(t *testing.T) {
for i := 0; i != 25; i++ {
alen := aggregateDataPerDay(uint32(i))
assert.Equalf(t, 30, alen, "i=%d", i)
}
</s> add t.Run("hours", func(t *testing.T) {
statsData := statsCollector(units, 0, Hours, ng)
assert.Len(t, statsData, 720)
})
t.Run("days", func(t *testing.T) {
for i := 0; i != 25; i++ {
statsData := statsCollector(units, uint32(i), Days, ng)
require.Lenf(t, statsData, 30, "i=%d", i)
}
}) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/querylog/qlog_test.go |
BaseDir: aghtest.PrepareTestDir(t), | <mask> Enabled: true,
<mask> FileEnabled: false,
<mask> Interval: 1,
<mask> MemSize: 2,
<mask> BaseDir: prepareTestDir(t),
<mask> })
<mask>
<mask> addEntry(l, "example1.org", net.IPv4(1, 1, 1, 1), net.IPv4(2, 2, 2, 1))
<mask> addEntry(l, "example2.org", net.IPv4(1, 1, 1, 1), net.IPv4(2, 2, 2, 1))
<mask> // The oldest entry is going to be removed from memory buffer.
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove BaseDir: prepareTestDir(t),
</s> add BaseDir: aghtest.PrepareTestDir(t), </s> remove BaseDir: prepareTestDir(t),
</s> add BaseDir: aghtest.PrepareTestDir(t), </s> remove BaseDir: prepareTestDir(t),
</s> add BaseDir: aghtest.PrepareTestDir(t), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/querylog/qlog_test.go |
"github.com/AdguardTeam/AdGuardHome/internal/aghtest" | <mask> "testing"
<mask> "time"
<mask>
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
<mask>
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/querylog/qlogfile_test.go |
func prepareTestFiles(t *testing.T, filesNum, linesNum int) []string { | <mask> )
<mask>
<mask> // prepareTestFiles prepares several test query log files, each with the
<mask> // specified lines count.
<mask> func prepareTestFiles(t *testing.T, dir string, filesNum, linesNum int) []string {
<mask> t.Helper()
<mask>
<mask> const strV = "\"%s\""
<mask> const nl = "\n"
<mask> const format = `{"IP":` + strV + `,"T":` + strV + `,` +
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove func prepareTestFile(t *testing.T, dir string, linesCount int) string {
</s> add func prepareTestFile(t *testing.T, linesCount int) string { </s> remove dhcpcdConf := nl + `interface wlan0` + nl +
`static ip_address=192.168.0.2/24` + nl +
`static routers=192.168.0.1` + nl +
`static domain_name_servers=192.168.0.2` + nl + nl
s := updateStaticIPdhcpcdConf("wlan0", "192.168.0.2/24", net.IP{192, 168, 0, 1}, net.IP{192, 168, 0, 2})
assert.Equal(t, dhcpcdConf, s)
// without gateway
dhcpcdConf = nl + `interface wlan0` + nl +
`static ip_address=192.168.0.2/24` + nl +
`static domain_name_servers=192.168.0.2` + nl + nl
</s> add testCases := []struct {
name string
dhcpcdConf string
routers net.IP
}{{
name: "with_gateway",
dhcpcdConf: nl + `interface wlan0` + nl +
`static ip_address=192.168.0.2/24` + nl +
`static routers=192.168.0.1` + nl +
`static domain_name_servers=192.168.0.2` + nl + nl,
routers: net.IP{192, 168, 0, 1},
}, {
name: "without_gateway",
dhcpcdConf: nl + `interface wlan0` + nl +
`static ip_address=192.168.0.2/24` + nl +
`static domain_name_servers=192.168.0.2` + nl + nl,
routers: nil,
}} </s> remove s = updateStaticIPdhcpcdConf("wlan0", "192.168.0.2/24", nil, net.IP{192, 168, 0, 2})
assert.Equal(t, dhcpcdConf, s)
</s> add for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
s := updateStaticIPdhcpcdConf("wlan0", "192.168.0.2/24", tc.routers, net.IP{192, 168, 0, 2})
assert.Equal(t, tc.dhcpcdConf, s)
})
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/querylog/qlogfile_test.go |
if filesNum == 0 {
return []string{}
}
| <mask> t.Helper()
<mask>
<mask> const strV = "\"%s\""
<mask> const nl = "\n"
<mask> const format = `{"IP":` + strV + `,"T":` + strV + `,` +
<mask> `"QH":"example.org","QT":"A","QC":"IN",` +
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove func prepareTestFiles(t *testing.T, dir string, filesNum, linesNum int) []string {
</s> add func prepareTestFiles(t *testing.T, filesNum, linesNum int) []string { </s> remove dhcpcdConf := nl + `interface wlan0` + nl +
`static ip_address=192.168.0.2/24` + nl +
`static routers=192.168.0.1` + nl +
`static domain_name_servers=192.168.0.2` + nl + nl
s := updateStaticIPdhcpcdConf("wlan0", "192.168.0.2/24", net.IP{192, 168, 0, 1}, net.IP{192, 168, 0, 2})
assert.Equal(t, dhcpcdConf, s)
// without gateway
dhcpcdConf = nl + `interface wlan0` + nl +
`static ip_address=192.168.0.2/24` + nl +
`static domain_name_servers=192.168.0.2` + nl + nl
</s> add testCases := []struct {
name string
dhcpcdConf string
routers net.IP
}{{
name: "with_gateway",
dhcpcdConf: nl + `interface wlan0` + nl +
`static ip_address=192.168.0.2/24` + nl +
`static routers=192.168.0.1` + nl +
`static domain_name_servers=192.168.0.2` + nl + nl,
routers: net.IP{192, 168, 0, 1},
}, {
name: "without_gateway",
dhcpcdConf: nl + `interface wlan0` + nl +
`static ip_address=192.168.0.2/24` + nl +
`static domain_name_servers=192.168.0.2` + nl + nl,
routers: nil,
}} </s> remove s = updateStaticIPdhcpcdConf("wlan0", "192.168.0.2/24", nil, net.IP{192, 168, 0, 2})
assert.Equal(t, dhcpcdConf, s)
</s> add for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
s := updateStaticIPdhcpcdConf("wlan0", "192.168.0.2/24", tc.routers, net.IP{192, 168, 0, 2})
assert.Equal(t, tc.dhcpcdConf, s)
})
} </s> remove // this code is a chunk copied from getData() that generates aggregate data per day
func aggregateDataPerDay(firstID uint32) int {
firstDayID := (firstID + 24 - 1) / 24 * 24 // align_ceil(24)
a := []uint64{}
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != 720; i++ {
sum++
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
}
id++
}
if id <= nextDayID {
a = append(a, sum)
</s> add func TestStatsCollector(t *testing.T) {
ng := func(_ *unitDB) uint64 {
return 0 | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/querylog/qlogfile_test.go |
dir := aghtest.PrepareTestDir(t)
| <mask> lineIP := uint32(0)
<mask>
<mask> files := make([]string, filesNum)
<mask> for j := range files {
<mask> f, err := ioutil.TempFile(dir, "*.txt")
<mask> require.Nil(t, err)
<mask> files[filesNum-j-1] = f.Name()
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove f, err := ioutil.TempFile(prepareTestDir(t), "*.txt")
</s> add f, err := ioutil.TempFile(aghtest.PrepareTestDir(t), "*.txt") </s> remove dir := prepareTestDir()
defer func() { _ = os.RemoveAll(dir) }()
</s> add for _, str := range strs {
n, err := f.WriteString(str)
require.Nil(t, err)
assert.Equal(t, n, len(str))
}
} </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 func prepareTestDir() string {
const dir = "./agh-test"
_ = os.RemoveAll(dir)
_ = os.MkdirAll(dir, 0o755)
return dir
</s> add func prepareTestFile(t *testing.T) (f *os.File) {
t.Helper()
dir := aghtest.PrepareTestDir(t)
f, err := ioutil.TempFile(dir, "")
require.Nil(t, err)
require.NotNil(t, f)
t.Cleanup(func() {
assert.Nil(t, f.Close())
})
return f | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/querylog/qlogfile_test.go |
func prepareTestFile(t *testing.T, linesCount int) string { | <mask> }
<mask>
<mask> // prepareTestFile prepares a test query log file with the specified number of
<mask> // lines.
<mask> func prepareTestFile(t *testing.T, dir string, linesCount int) string {
<mask> t.Helper()
<mask>
<mask> return prepareTestFiles(t, dir, 1, linesCount)[0]
<mask> }
<mask>
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove return prepareTestFiles(t, dir, 1, linesCount)[0]
</s> add return prepareTestFiles(t, 1, linesCount)[0] </s> remove func prepareTestFiles(t *testing.T, dir string, filesNum, linesNum int) []string {
</s> add func prepareTestFiles(t *testing.T, filesNum, linesNum int) []string { </s> remove testFiles := prepareTestFiles(t, prepareTestDir(t), filesNum, linesNum)
</s> add testFiles := prepareTestFiles(t, filesNum, linesNum) </s> remove func prepareTestDir() string {
const dir = "./agh-test"
_ = os.RemoveAll(dir)
_ = os.MkdirAll(dir, 0o755)
return dir
</s> add func prepareTestFile(t *testing.T) (f *os.File) {
t.Helper()
dir := aghtest.PrepareTestDir(t)
f, err := ioutil.TempFile(dir, "")
require.Nil(t, err)
require.NotNil(t, f)
t.Cleanup(func() {
assert.Nil(t, f.Close())
})
return f </s> remove func prepareTestDir(t *testing.T) string {
t.Helper()
wd, err := os.Getwd()
require.Nil(t, err)
dir, err := ioutil.TempDir(wd, "agh-tests")
require.Nil(t, err)
require.NotEmpty(t, dir)
t.Cleanup(func() {
// TODO(e.burkov): Replace with t.TempDir methods after updating
// go version to 1.15.
start := time.Now()
for {
err := os.RemoveAll(dir)
if err == nil {
break
}
if runtime.GOOS != "windows" || time.Since(start) >= 500*time.Millisecond {
break
}
time.Sleep(5 * time.Millisecond)
}
assert.Nil(t, err)
})
return dir
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/querylog/qlogfile_test.go |
return prepareTestFiles(t, 1, linesCount)[0] | <mask> // lines.
<mask> func prepareTestFile(t *testing.T, dir string, linesCount int) string {
<mask> t.Helper()
<mask>
<mask> return prepareTestFiles(t, dir, 1, linesCount)[0]
<mask> }
<mask>
<mask> // newTestQLogFile creates new *QLogFile for tests and registers the required
<mask> // cleanup functions.
<mask> func newTestQLogFile(t *testing.T, linesNum int) (file *QLogFile) {
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove func prepareTestFile(t *testing.T, dir string, linesCount int) string {
</s> add func prepareTestFile(t *testing.T, linesCount int) string { </s> remove testFile := prepareTestFile(t, prepareTestDir(t), linesNum)
</s> add testFile := prepareTestFile(t, linesNum) </s> remove testFiles := prepareTestFiles(t, prepareTestDir(t), filesNum, linesNum)
</s> add testFiles := prepareTestFiles(t, filesNum, linesNum) </s> remove func prepareTestFiles(t *testing.T, dir string, filesNum, linesNum int) []string {
</s> add func prepareTestFiles(t *testing.T, filesNum, linesNum int) []string { </s> remove func prepareTestDir(t *testing.T) string {
t.Helper()
wd, err := os.Getwd()
require.Nil(t, err)
dir, err := ioutil.TempDir(wd, "agh-tests")
require.Nil(t, err)
require.NotEmpty(t, dir)
t.Cleanup(func() {
// TODO(e.burkov): Replace with t.TempDir methods after updating
// go version to 1.15.
start := time.Now()
for {
err := os.RemoveAll(dir)
if err == nil {
break
}
if runtime.GOOS != "windows" || time.Since(start) >= 500*time.Millisecond {
break
}
time.Sleep(5 * time.Millisecond)
}
assert.Nil(t, err)
})
return dir
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/querylog/qlogfile_test.go |
testFile := prepareTestFile(t, linesNum) | <mask> // cleanup functions.
<mask> func newTestQLogFile(t *testing.T, linesNum int) (file *QLogFile) {
<mask> t.Helper()
<mask>
<mask> testFile := prepareTestFile(t, prepareTestDir(t), linesNum)
<mask>
<mask> // Create the new QLogFile instance.
<mask> file, err := NewQLogFile(testFile)
<mask> require.Nil(t, err)
<mask> assert.NotNil(t, file)
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove testFiles := prepareTestFiles(t, prepareTestDir(t), filesNum, linesNum)
</s> add testFiles := prepareTestFiles(t, filesNum, linesNum) </s> remove return prepareTestFiles(t, dir, 1, linesCount)[0]
</s> add return prepareTestFiles(t, 1, linesCount)[0] </s> remove f, err := ioutil.TempFile(prepareTestDir(t), "*.txt")
</s> add f, err := ioutil.TempFile(aghtest.PrepareTestDir(t), "*.txt") </s> remove func prepareTestFiles(t *testing.T, dir string, filesNum, linesNum int) []string {
</s> add func prepareTestFiles(t *testing.T, filesNum, linesNum int) []string { </s> remove func prepareTestFile(t *testing.T, dir string, linesCount int) string {
</s> add func prepareTestFile(t *testing.T, linesCount int) string { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/querylog/qlogfile_test.go |
f, err := ioutil.TempFile(aghtest.PrepareTestDir(t), "*.txt") | <mask> assert.Empty(t, line)
<mask> }
<mask>
<mask> func NewTestQLogFileData(t *testing.T, data string) (file *QLogFile) {
<mask> f, err := ioutil.TempFile(prepareTestDir(t), "*.txt")
<mask> require.Nil(t, err)
<mask> t.Cleanup(func() {
<mask> assert.Nil(t, f.Close())
<mask> })
<mask>
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove func prepareTestDir() string {
const dir = "./agh-test"
_ = os.RemoveAll(dir)
_ = os.MkdirAll(dir, 0o755)
return dir
</s> add func prepareTestFile(t *testing.T) (f *os.File) {
t.Helper()
dir := aghtest.PrepareTestDir(t)
f, err := ioutil.TempFile(dir, "")
require.Nil(t, err)
require.NotNil(t, f)
t.Cleanup(func() {
assert.Nil(t, f.Close())
})
return f </s> remove testFile := prepareTestFile(t, prepareTestDir(t), linesNum)
</s> add testFile := prepareTestFile(t, linesNum) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/querylog/qlogfile_test.go |
testFiles := prepareTestFiles(t, filesNum, linesNum) | <mask> // required cleanup functions.
<mask> func newTestQLogReader(t *testing.T, filesNum, linesNum int) (reader *QLogReader) {
<mask> t.Helper()
<mask>
<mask> testFiles := prepareTestFiles(t, prepareTestDir(t), filesNum, linesNum)
<mask>
<mask> // Create the new QLogReader instance.
<mask> reader, err := NewQLogReader(testFiles)
<mask> require.Nil(t, err)
<mask> assert.NotNil(t, reader)
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove testFile := prepareTestFile(t, prepareTestDir(t), linesNum)
</s> add testFile := prepareTestFile(t, linesNum) </s> remove return prepareTestFiles(t, dir, 1, linesCount)[0]
</s> add return prepareTestFiles(t, 1, linesCount)[0] </s> remove func prepareTestFiles(t *testing.T, dir string, filesNum, linesNum int) []string {
</s> add func prepareTestFiles(t *testing.T, filesNum, linesNum int) []string { </s> remove func prepareTestFile(t *testing.T, dir string, linesCount int) string {
</s> add func prepareTestFile(t *testing.T, linesCount int) string { </s> remove f, err := ioutil.TempFile(prepareTestDir(t), "*.txt")
</s> add f, err := ioutil.TempFile(aghtest.PrepareTestDir(t), "*.txt") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/querylog/qlogreader_test.go |
"github.com/stretchr/testify/require" | <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghtest"
<mask> "github.com/stretchr/testify/assert"
<mask> )
<mask>
<mask> func TestMain(m *testing.M) {
<mask> aghtest.DiscardLogOutput(m)
<mask> }
<mask>
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove func prepareTestDir() string {
const dir = "./agh-test"
_ = os.RemoveAll(dir)
_ = os.MkdirAll(dir, 0o755)
return dir
</s> add func prepareTestFile(t *testing.T) (f *os.File) {
t.Helper()
dir := aghtest.PrepareTestDir(t)
f, err := ioutil.TempFile(dir, "")
require.Nil(t, err)
require.NotNil(t, f)
t.Cleanup(func() {
assert.Nil(t, f.Close())
})
return f </s> remove func prepareTestDir(t *testing.T) string {
t.Helper()
wd, err := os.Getwd()
require.Nil(t, err)
dir, err := ioutil.TempDir(wd, "agh-tests")
require.Nil(t, err)
require.NotEmpty(t, dir)
t.Cleanup(func() {
// TODO(e.burkov): Replace with t.TempDir methods after updating
// go version to 1.15.
start := time.Now()
for {
err := os.RemoveAll(dir)
if err == nil {
break
}
if runtime.GOOS != "windows" || time.Since(start) >= 500*time.Millisecond {
break
}
time.Sleep(5 * time.Millisecond)
}
assert.Nil(t, err)
})
return dir
}
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/stats/stats_test.go |
s, err := createObject(conf)
require.Nil(t, err) | <mask> conf := Config{
<mask> Filename: "./stats.db",
<mask> LimitDays: 1,
<mask> }
<mask> t.Cleanup(func() {
<mask> s.clear()
<mask> s.Close()
<mask> assert.Nil(t, os.Remove(conf.Filename))
<mask> })
<mask>
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove // log.SetLevel(log.DEBUG)
</s> add </s> remove
s.clear()
s.Close()
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/stats/stats_test.go |
s.clear()
s.Close() | <mask> s, err := createObject(conf)
<mask> require.Nil(t, err)
<mask> t.Cleanup(func() {
<mask> assert.Nil(t, os.Remove(conf.Filename))
<mask> })
<mask>
<mask> s.Update(Entry{
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove s, _ := createObject(conf)
e := Entry{}
e.Domain = "domain"
e.Client = "127.0.0.1"
e.Result = RFiltered
e.Time = 123456
s.Update(e)
e.Domain = "domain"
e.Client = "127.0.0.1"
e.Result = RNotFiltered
e.Time = 123456
s.Update(e)
</s> add s.Update(Entry{
Domain: "domain",
Client: "127.0.0.1",
Result: RFiltered,
Time: 123456,
})
s.Update(Entry{
Domain: "domain",
Client: "127.0.0.1",
Result: RNotFiltered,
Time: 123456,
}) </s> remove f, err := ioutil.TempFile(prepareTestDir(t), "*.txt")
</s> add f, err := ioutil.TempFile(aghtest.PrepareTestDir(t), "*.txt") | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/stats/stats_test.go |
s.Update(Entry{
Domain: "domain",
Client: "127.0.0.1",
Result: RFiltered,
Time: 123456,
})
s.Update(Entry{
Domain: "domain",
Client: "127.0.0.1",
Result: RNotFiltered,
Time: 123456,
}) | <mask> t.Cleanup(func() {
<mask> assert.Nil(t, os.Remove(conf.Filename))
<mask> })
<mask>
<mask> s, _ := createObject(conf)
<mask>
<mask> e := Entry{}
<mask>
<mask> e.Domain = "domain"
<mask> e.Client = "127.0.0.1"
<mask> e.Result = RFiltered
<mask> e.Time = 123456
<mask> s.Update(e)
<mask>
<mask> e.Domain = "domain"
<mask> e.Client = "127.0.0.1"
<mask> e.Result = RNotFiltered
<mask> e.Time = 123456
<mask> s.Update(e)
<mask>
<mask> d, ok := s.getData()
<mask> assert.True(t, ok)
<mask>
<mask> a := []uint64{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2}
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove assert.True(t, ok)
</s> add require.True(t, ok) </s> remove s, _ := createObject(conf)
e := Entry{}
n := 1000 // number of distinct clients and domains every hour
for h := 0; h != 12; h++ {
if h != 0 {
atomic.AddInt32(&hour, 1)
}
for i := 0; i != n; i++ {
e.Domain = fmt.Sprintf("domain%d", i)
ip := net.IP{127, 0, 0, 1}
ip[2] = byte((i & 0xff00) >> 8)
ip[3] = byte(i & 0xff)
e.Client = ip.String()
e.Result = RNotFiltered
e.Time = 123456
s.Update(e)
</s> add // Number of distinct clients and domains every hour.
const n = 1000
for h := 0; h < 12; h++ {
atomic.AddInt32(&hour, 1)
for i := 0; i < n; i++ {
s.Update(Entry{
Domain: fmt.Sprintf("domain%d", i),
Client: net.IP{
127,
0,
byte((i & 0xff00) >> 8),
byte(i & 0xff),
}.String(),
Result: RNotFiltered,
Time: 123456,
}) </s> remove // Check if we are notified about changes
ips = ah.Process("newhost", dns.TypeA)
assert.NotNil(t, ips)
assert.Len(t, ips, 1)
assert.True(t, net.IP{127, 0, 0, 2}.Equal(ips[0]))
</s> add t.Run("notified", func(t *testing.T) {
ips := ah.Process("newhost", dns.TypeA)
assert.NotNil(t, ips)
require.Len(t, ips, 1)
assert.True(t, net.IP{127, 0, 0, 2}.Equal(ips[0]))
}) </s> remove
s.clear()
s.Close()
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/stats/stats_test.go |
require.True(t, ok) | <mask> e.Time = 123456
<mask> s.Update(e)
<mask>
<mask> d, ok := s.getData()
<mask> assert.True(t, ok)
<mask>
<mask> a := []uint64{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2}
<mask> assert.True(t, UIntArrayEquals(d.DNSQueries, a))
<mask>
<mask> a = []uint64{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove s, _ := createObject(conf)
e := Entry{}
e.Domain = "domain"
e.Client = "127.0.0.1"
e.Result = RFiltered
e.Time = 123456
s.Update(e)
e.Domain = "domain"
e.Client = "127.0.0.1"
e.Result = RNotFiltered
e.Time = 123456
s.Update(e)
</s> add s.Update(Entry{
Domain: "domain",
Client: "127.0.0.1",
Result: RFiltered,
Time: 123456,
})
s.Update(Entry{
Domain: "domain",
Client: "127.0.0.1",
Result: RNotFiltered,
Time: 123456,
}) </s> remove // Check if we are notified about changes
ips = ah.Process("newhost", dns.TypeA)
assert.NotNil(t, ips)
assert.Len(t, ips, 1)
assert.True(t, net.IP{127, 0, 0, 2}.Equal(ips[0]))
</s> add t.Run("notified", func(t *testing.T) {
ips := ah.Process("newhost", dns.TypeA)
assert.NotNil(t, ips)
require.Len(t, ips, 1)
assert.True(t, net.IP{127, 0, 0, 2}.Equal(ips[0]))
}) </s> remove
s.clear()
s.Close()
</s> add </s> remove func TestIP(t *testing.T) {
assert.True(t, net.IP{127, 0, 0, 1}.Equal(DNSUnreverseAddr("1.0.0.127.in-addr.arpa")))
assert.Equal(t, "::abcd:1234", DNSUnreverseAddr("4.3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa").String())
assert.Equal(t, "::abcd:1234", DNSUnreverseAddr("4.3.2.1.d.c.B.A.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa").String())
assert.Nil(t, DNSUnreverseAddr("1.0.0.127.in-addr.arpa."))
assert.Nil(t, DNSUnreverseAddr(".0.0.127.in-addr.arpa"))
assert.Nil(t, DNSUnreverseAddr(".3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa"))
assert.Nil(t, DNSUnreverseAddr("4.3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0..ip6.arpa"))
assert.Nil(t, DNSUnreverseAddr("4.3.2.1.d.c.b. .0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa"))
</s> add func TestDNSReverseAddr(t *testing.T) {
testCases := []struct {
name string
have string
want net.IP
}{{
name: "good_ipv4",
have: "1.0.0.127.in-addr.arpa",
want: net.IP{127, 0, 0, 1},
}, {
name: "good_ipv6",
have: "4.3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa",
want: net.ParseIP("::abcd:1234"),
}, {
name: "good_ipv6_case",
have: "4.3.2.1.d.c.B.A.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa",
want: net.ParseIP("::abcd:1234"),
}, {
name: "bad_ipv4_dot",
have: "1.0.0.127.in-addr.arpa.",
}, {
name: "wrong_ipv4",
have: ".0.0.127.in-addr.arpa",
}, {
name: "wrong_ipv6",
have: ".3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa",
}, {
name: "bad_ipv6_dot",
have: "4.3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0..ip6.arpa",
}, {
name: "bad_ipv6_space",
have: "4.3.2.1.d.c.b. .0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa",
}}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
ip := DNSUnreverseAddr(tc.have)
assert.True(t, tc.want.Equal(ip))
})
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/stats/stats_test.go |
require.NotEmpty(t, m) | <mask>
<mask> m := d.TopQueried
<mask> assert.EqualValues(t, 1, m[0]["domain"])
<mask>
<mask> m = d.TopBlocked
<mask> require.NotEmpty(t, m)
<mask> assert.EqualValues(t, 1, m[0]["domain"])
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove
s.clear()
s.Close()
</s> add </s> remove assert.True(t, ok)
assert.EqualValues(t, int(hour)*n, d.NumDNSQueries)
s.Close()
</s> add require.True(t, ok)
assert.EqualValues(t, hour*n, d.NumDNSQueries) </s> remove BaseDir: prepareTestDir(t),
</s> add BaseDir: aghtest.PrepareTestDir(t), | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/stats/stats_test.go |
require.NotEmpty(t, m) | <mask> require.NotEmpty(t, m)
<mask> assert.EqualValues(t, 1, m[0]["domain"])
<mask>
<mask> m = d.TopBlocked
<mask> assert.EqualValues(t, 1, m[0]["domain"])
<mask>
<mask> m = d.TopClients
<mask> require.NotEmpty(t, m)
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove
s.clear()
s.Close()
</s> add </s> remove assert.True(t, ok)
assert.EqualValues(t, int(hour)*n, d.NumDNSQueries)
s.Close()
</s> add require.True(t, ok)
assert.EqualValues(t, hour*n, d.NumDNSQueries) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/stats/stats_test.go |
require.NotEmpty(t, m) | <mask> require.NotEmpty(t, m)
<mask> assert.EqualValues(t, 1, m[0]["domain"])
<mask>
<mask> m = d.TopClients
<mask> assert.EqualValues(t, 2, m[0]["127.0.0.1"])
<mask>
<mask> assert.EqualValues(t, 2, d.NumDNSQueries)
<mask> assert.EqualValues(t, 1, d.NumBlockedFiltering)
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove assert.True(t, ok)
assert.EqualValues(t, int(hour)*n, d.NumDNSQueries)
s.Close()
</s> add require.True(t, ok)
assert.EqualValues(t, hour*n, d.NumDNSQueries) </s> remove BaseDir: prepareTestDir(t),
</s> add BaseDir: aghtest.PrepareTestDir(t), </s> remove BaseDir: prepareTestDir(t),
</s> add BaseDir: aghtest.PrepareTestDir(t), | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/stats/stats_test.go |
require.NotEmpty(t, topClients) | <mask>
<mask> topClients := s.GetTopClientsIP(2)
<mask> assert.True(t, net.IP{127, 0, 0, 1}.Equal(topClients[0]))
<mask> }
<mask>
<mask> func TestLargeNumbers(t *testing.T) {
<mask> var hour int32 = 0
<mask> newID := func() uint32 {
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove
s.clear()
s.Close()
</s> add </s> remove var hour int32 = 1
</s> add var hour int32 = 0 </s> remove // use "atomic" to make Go race detector happy
</s> add // Use "atomic" to make go race detector happy. </s> remove // Check if we are notified about changes
ips = ah.Process("newhost", dns.TypeA)
assert.NotNil(t, ips)
assert.Len(t, ips, 1)
assert.True(t, net.IP{127, 0, 0, 2}.Equal(ips[0]))
</s> add t.Run("notified", func(t *testing.T) {
ips := ah.Process("newhost", dns.TypeA)
assert.NotNil(t, ips)
require.Len(t, ips, 1)
assert.True(t, net.IP{127, 0, 0, 2}.Equal(ips[0]))
}) </s> remove func TestIP(t *testing.T) {
assert.True(t, net.IP{127, 0, 0, 1}.Equal(DNSUnreverseAddr("1.0.0.127.in-addr.arpa")))
assert.Equal(t, "::abcd:1234", DNSUnreverseAddr("4.3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa").String())
assert.Equal(t, "::abcd:1234", DNSUnreverseAddr("4.3.2.1.d.c.B.A.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa").String())
assert.Nil(t, DNSUnreverseAddr("1.0.0.127.in-addr.arpa."))
assert.Nil(t, DNSUnreverseAddr(".0.0.127.in-addr.arpa"))
assert.Nil(t, DNSUnreverseAddr(".3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa"))
assert.Nil(t, DNSUnreverseAddr("4.3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0..ip6.arpa"))
assert.Nil(t, DNSUnreverseAddr("4.3.2.1.d.c.b. .0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa"))
</s> add func TestDNSReverseAddr(t *testing.T) {
testCases := []struct {
name string
have string
want net.IP
}{{
name: "good_ipv4",
have: "1.0.0.127.in-addr.arpa",
want: net.IP{127, 0, 0, 1},
}, {
name: "good_ipv6",
have: "4.3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa",
want: net.ParseIP("::abcd:1234"),
}, {
name: "good_ipv6_case",
have: "4.3.2.1.d.c.B.A.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa",
want: net.ParseIP("::abcd:1234"),
}, {
name: "bad_ipv4_dot",
have: "1.0.0.127.in-addr.arpa.",
}, {
name: "wrong_ipv4",
have: ".0.0.127.in-addr.arpa",
}, {
name: "wrong_ipv6",
have: ".3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa",
}, {
name: "bad_ipv6_dot",
have: "4.3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0..ip6.arpa",
}, {
name: "bad_ipv6_space",
have: "4.3.2.1.d.c.b. .0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa",
}}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
ip := DNSUnreverseAddr(tc.have)
assert.True(t, tc.want.Equal(ip))
})
} | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/stats/stats_test.go |
<mask> assert.EqualValues(t, 0.123456, d.AvgProcessingTime)
<mask>
<mask> topClients := s.GetTopClientsIP(2)
<mask> assert.True(t, net.IP{127, 0, 0, 1}.Equal(topClients[0]))
<mask>
<mask> s.clear()
<mask> s.Close()
<mask> }
<mask>
<mask> func TestLargeNumbers(t *testing.T) {
<mask> var hour int32 = 1
<mask> newID := func() uint32 {
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove var hour int32 = 1
</s> add var hour int32 = 0 </s> remove // use "atomic" to make Go race detector happy
</s> add // Use "atomic" to make go race detector happy. </s> remove // Check if we are notified about changes
ips = ah.Process("newhost", dns.TypeA)
assert.NotNil(t, ips)
assert.Len(t, ips, 1)
assert.True(t, net.IP{127, 0, 0, 2}.Equal(ips[0]))
</s> add t.Run("notified", func(t *testing.T) {
ips := ah.Process("newhost", dns.TypeA)
assert.NotNil(t, ips)
require.Len(t, ips, 1)
assert.True(t, net.IP{127, 0, 0, 2}.Equal(ips[0]))
}) </s> remove func TestIP(t *testing.T) {
assert.True(t, net.IP{127, 0, 0, 1}.Equal(DNSUnreverseAddr("1.0.0.127.in-addr.arpa")))
assert.Equal(t, "::abcd:1234", DNSUnreverseAddr("4.3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa").String())
assert.Equal(t, "::abcd:1234", DNSUnreverseAddr("4.3.2.1.d.c.B.A.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa").String())
assert.Nil(t, DNSUnreverseAddr("1.0.0.127.in-addr.arpa."))
assert.Nil(t, DNSUnreverseAddr(".0.0.127.in-addr.arpa"))
assert.Nil(t, DNSUnreverseAddr(".3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa"))
assert.Nil(t, DNSUnreverseAddr("4.3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0..ip6.arpa"))
assert.Nil(t, DNSUnreverseAddr("4.3.2.1.d.c.b. .0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa"))
</s> add func TestDNSReverseAddr(t *testing.T) {
testCases := []struct {
name string
have string
want net.IP
}{{
name: "good_ipv4",
have: "1.0.0.127.in-addr.arpa",
want: net.IP{127, 0, 0, 1},
}, {
name: "good_ipv6",
have: "4.3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa",
want: net.ParseIP("::abcd:1234"),
}, {
name: "good_ipv6_case",
have: "4.3.2.1.d.c.B.A.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa",
want: net.ParseIP("::abcd:1234"),
}, {
name: "bad_ipv4_dot",
have: "1.0.0.127.in-addr.arpa.",
}, {
name: "wrong_ipv4",
have: ".0.0.127.in-addr.arpa",
}, {
name: "wrong_ipv6",
have: ".3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa",
}, {
name: "bad_ipv6_dot",
have: "4.3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0..ip6.arpa",
}, {
name: "bad_ipv6_space",
have: "4.3.2.1.d.c.b. .0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa",
}}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
ip := DNSUnreverseAddr(tc.have)
assert.True(t, tc.want.Equal(ip))
})
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/stats/stats_test.go | |
var hour int32 = 0 | <mask> s.Close()
<mask> }
<mask>
<mask> func TestLargeNumbers(t *testing.T) {
<mask> var hour int32 = 1
<mask> newID := func() uint32 {
<mask> // use "atomic" to make Go race detector happy
<mask> return uint32(atomic.LoadInt32(&hour))
<mask> }
<mask>
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove // use "atomic" to make Go race detector happy
</s> add // Use "atomic" to make go race detector happy. </s> remove // log.SetLevel(log.DEBUG)
</s> add </s> remove
s.clear()
s.Close()
</s> add </s> remove // this code is a chunk copied from getData() that generates aggregate data per day
func aggregateDataPerDay(firstID uint32) int {
firstDayID := (firstID + 24 - 1) / 24 * 24 // align_ceil(24)
a := []uint64{}
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != 720; i++ {
sum++
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
}
id++
}
if id <= nextDayID {
a = append(a, sum)
</s> add func TestStatsCollector(t *testing.T) {
ng := func(_ *unitDB) uint64 {
return 0 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/stats/stats_test.go |
// Use "atomic" to make go race detector happy. | <mask>
<mask> func TestLargeNumbers(t *testing.T) {
<mask> var hour int32 = 1
<mask> newID := func() uint32 {
<mask> // use "atomic" to make Go race detector happy
<mask> return uint32(atomic.LoadInt32(&hour))
<mask> }
<mask>
<mask> // log.SetLevel(log.DEBUG)
<mask> conf := Config{
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove var hour int32 = 1
</s> add var hour int32 = 0 </s> remove // log.SetLevel(log.DEBUG)
</s> add </s> remove
s.clear()
s.Close()
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/stats/stats_test.go |
<mask> // use "atomic" to make Go race detector happy
<mask> return uint32(atomic.LoadInt32(&hour))
<mask> }
<mask>
<mask> // log.SetLevel(log.DEBUG)
<mask> conf := Config{
<mask> Filename: "./stats.db",
<mask> LimitDays: 1,
<mask> UnitID: newID,
<mask> }
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove // use "atomic" to make Go race detector happy
</s> add // Use "atomic" to make go race detector happy. </s> remove var hour int32 = 1
</s> add var hour int32 = 0 </s> remove func prepareTestDir(t *testing.T) string {
t.Helper()
wd, err := os.Getwd()
require.Nil(t, err)
dir, err := ioutil.TempDir(wd, "agh-tests")
require.Nil(t, err)
require.NotEmpty(t, dir)
t.Cleanup(func() {
// TODO(e.burkov): Replace with t.TempDir methods after updating
// go version to 1.15.
start := time.Now()
for {
err := os.RemoveAll(dir)
if err == nil {
break
}
if runtime.GOOS != "windows" || time.Since(start) >= 500*time.Millisecond {
break
}
time.Sleep(5 * time.Millisecond)
}
assert.Nil(t, err)
})
return dir
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/stats/stats_test.go | |
s, err := createObject(conf)
require.Nil(t, err) | <mask> Filename: "./stats.db",
<mask> LimitDays: 1,
<mask> UnitID: newID,
<mask> }
<mask> t.Cleanup(func() {
<mask> s.Close()
<mask> assert.Nil(t, os.Remove(conf.Filename))
<mask> })
<mask>
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove // log.SetLevel(log.DEBUG)
</s> add </s> remove f, err := ioutil.TempFile(prepareTestDir(t), "*.txt")
</s> add f, err := ioutil.TempFile(aghtest.PrepareTestDir(t), "*.txt") | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/stats/stats_test.go |
s.Close() | <mask> }
<mask> s, err := createObject(conf)
<mask> require.Nil(t, err)
<mask> t.Cleanup(func() {
<mask> assert.Nil(t, os.Remove(conf.Filename))
<mask> })
<mask>
<mask> // Number of distinct clients and domains every hour.
<mask> const n = 1000
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove s, _ := createObject(conf)
e := Entry{}
n := 1000 // number of distinct clients and domains every hour
for h := 0; h != 12; h++ {
if h != 0 {
atomic.AddInt32(&hour, 1)
}
for i := 0; i != n; i++ {
e.Domain = fmt.Sprintf("domain%d", i)
ip := net.IP{127, 0, 0, 1}
ip[2] = byte((i & 0xff00) >> 8)
ip[3] = byte(i & 0xff)
e.Client = ip.String()
e.Result = RNotFiltered
e.Time = 123456
s.Update(e)
</s> add // Number of distinct clients and domains every hour.
const n = 1000
for h := 0; h < 12; h++ {
atomic.AddInt32(&hour, 1)
for i := 0; i < n; i++ {
s.Update(Entry{
Domain: fmt.Sprintf("domain%d", i),
Client: net.IP{
127,
0,
byte((i & 0xff00) >> 8),
byte(i & 0xff),
}.String(),
Result: RNotFiltered,
Time: 123456,
}) </s> remove func prepareTestDir(t *testing.T) string {
t.Helper()
wd, err := os.Getwd()
require.Nil(t, err)
dir, err := ioutil.TempDir(wd, "agh-tests")
require.Nil(t, err)
require.NotEmpty(t, dir)
t.Cleanup(func() {
// TODO(e.burkov): Replace with t.TempDir methods after updating
// go version to 1.15.
start := time.Now()
for {
err := os.RemoveAll(dir)
if err == nil {
break
}
if runtime.GOOS != "windows" || time.Since(start) >= 500*time.Millisecond {
break
}
time.Sleep(5 * time.Millisecond)
}
assert.Nil(t, err)
})
return dir
}
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/stats/stats_test.go |
// Number of distinct clients and domains every hour.
const n = 1000
for h := 0; h < 12; h++ {
atomic.AddInt32(&hour, 1)
for i := 0; i < n; i++ {
s.Update(Entry{
Domain: fmt.Sprintf("domain%d", i),
Client: net.IP{
127,
0,
byte((i & 0xff00) >> 8),
byte(i & 0xff),
}.String(),
Result: RNotFiltered,
Time: 123456,
}) | <mask> t.Cleanup(func() {
<mask> assert.Nil(t, os.Remove(conf.Filename))
<mask> })
<mask>
<mask> s, _ := createObject(conf)
<mask> e := Entry{}
<mask>
<mask> n := 1000 // number of distinct clients and domains every hour
<mask> for h := 0; h != 12; h++ {
<mask> if h != 0 {
<mask> atomic.AddInt32(&hour, 1)
<mask> }
<mask> for i := 0; i != n; i++ {
<mask> e.Domain = fmt.Sprintf("domain%d", i)
<mask> ip := net.IP{127, 0, 0, 1}
<mask> ip[2] = byte((i & 0xff00) >> 8)
<mask> ip[3] = byte(i & 0xff)
<mask> e.Client = ip.String()
<mask> e.Result = RNotFiltered
<mask> e.Time = 123456
<mask> s.Update(e)
<mask> }
<mask> }
<mask>
<mask> d, ok := s.getData()
<mask> assert.True(t, ok)
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove s, _ := createObject(conf)
e := Entry{}
e.Domain = "domain"
e.Client = "127.0.0.1"
e.Result = RFiltered
e.Time = 123456
s.Update(e)
e.Domain = "domain"
e.Client = "127.0.0.1"
e.Result = RNotFiltered
e.Time = 123456
s.Update(e)
</s> add s.Update(Entry{
Domain: "domain",
Client: "127.0.0.1",
Result: RFiltered,
Time: 123456,
})
s.Update(Entry{
Domain: "domain",
Client: "127.0.0.1",
Result: RNotFiltered,
Time: 123456,
}) </s> remove func TestAggregateDataPerTimeUnit(t *testing.T) {
for i := 0; i != 25; i++ {
alen := aggregateDataPerDay(uint32(i))
assert.Equalf(t, 30, alen, "i=%d", i)
}
</s> add t.Run("hours", func(t *testing.T) {
statsData := statsCollector(units, 0, Hours, ng)
assert.Len(t, statsData, 720)
})
t.Run("days", func(t *testing.T) {
for i := 0; i != 25; i++ {
statsData := statsCollector(units, uint32(i), Days, ng)
require.Lenf(t, statsData, 30, "i=%d", i)
}
}) </s> remove return len(a)
}
</s> add units := make([]*unitDB, 720) </s> remove assert.True(t, ok)
</s> add require.True(t, ok) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/stats/stats_test.go |
require.True(t, ok)
assert.EqualValues(t, hour*n, d.NumDNSQueries) | <mask> }
<mask> }
<mask>
<mask> d, ok := s.getData()
<mask> assert.True(t, ok)
<mask> assert.EqualValues(t, int(hour)*n, d.NumDNSQueries)
<mask>
<mask> s.Close()
<mask> }
<mask>
<mask> // this code is a chunk copied from getData() that generates aggregate data per day
<mask> func aggregateDataPerDay(firstID uint32) int {
<mask> firstDayID := (firstID + 24 - 1) / 24 * 24 // align_ceil(24)
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove // this code is a chunk copied from getData() that generates aggregate data per day
func aggregateDataPerDay(firstID uint32) int {
firstDayID := (firstID + 24 - 1) / 24 * 24 // align_ceil(24)
a := []uint64{}
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != 720; i++ {
sum++
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
}
id++
}
if id <= nextDayID {
a = append(a, sum)
</s> add func TestStatsCollector(t *testing.T) {
ng := func(_ *unitDB) uint64 {
return 0 </s> remove // per time unit counters:
// 720 hours may span 31 days, so we skip data for the first day in this case
firstDayID := (firstID + 24 - 1) / 24 * 24 // align_ceil(24)
statsCollector := func(numsGetter func(u *unitDB) (num uint64)) (nums []uint64) {
if timeUnit == Hours {
for _, u := range units {
nums = append(nums, numsGetter(u))
}
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := int(firstDayID - firstID); i != len(units); i++ {
sum += numsGetter(units[i])
if id == nextDayID {
nums = append(nums, sum)
sum = 0
nextDayID += 24
}
id++
}
if id <= nextDayID {
nums = append(nums, sum)
}
}
return nums
}
topsCollector := func(max int, pairsGetter func(u *unitDB) (pairs []countPair)) []map[string]uint64 {
m := map[string]uint64{}
for _, u := range units {
for _, it := range pairsGetter(u) {
m[it.Name] += it.Count
}
}
a2 := convertMapToSlice(m, max)
return convertTopSlice(a2)
}
dnsQueries := statsCollector(func(u *unitDB) (num uint64) { return u.NTotal })
</s> add dnsQueries := statsCollector(units, firstID, timeUnit, func(u *unitDB) (num uint64) { return u.NTotal }) </s> remove assert.True(t, ok)
</s> add require.True(t, ok) </s> remove // Existing host
ips := ah.Process("localhost", dns.TypeA)
assert.NotNil(t, ips)
assert.Len(t, ips, 1)
assert.Equal(t, net.ParseIP("127.0.0.1"), ips[0])
// Unknown host
ips = ah.Process("newhost", dns.TypeA)
assert.Nil(t, ips)
// Unknown host (comment)
ips = ah.Process("comment", dns.TypeA)
assert.Nil(t, ips)
// Test hosts file
table := ah.List()
names, ok := table["127.0.0.1"]
assert.True(t, ok)
assert.Equal(t, []string{"host", "localhost"}, names)
// Test PTR
a, _ := dns.ReverseAddr("127.0.0.1")
a = strings.TrimSuffix(a, ".")
hosts := ah.ProcessReverse(a, dns.TypePTR)
if assert.Len(t, hosts, 2) {
assert.Equal(t, hosts[0], "host")
}
a, _ = dns.ReverseAddr("::1")
a = strings.TrimSuffix(a, ".")
hosts = ah.ProcessReverse(a, dns.TypePTR)
if assert.Len(t, hosts, 1) {
assert.Equal(t, hosts[0], "localhost")
}
</s> add t.Run("existing_host", func(t *testing.T) {
ips := ah.Process("localhost", dns.TypeA)
require.Len(t, ips, 1)
assert.Equal(t, net.IPv4(127, 0, 0, 1), ips[0])
})
t.Run("unknown_host", func(t *testing.T) {
ips := ah.Process("newhost", dns.TypeA)
assert.Nil(t, ips)
// Comment.
ips = ah.Process("comment", dns.TypeA)
assert.Nil(t, ips)
})
t.Run("hosts_file", func(t *testing.T) {
names, ok := ah.List()["127.0.0.1"]
require.True(t, ok)
assert.Equal(t, []string{"host", "localhost"}, names)
})
t.Run("ptr", func(t *testing.T) {
testCases := []struct {
wantIP string
wantLen int
wantHost string
}{
{wantIP: "127.0.0.1", wantLen: 2, wantHost: "host"},
{wantIP: "::1", wantLen: 1, wantHost: "localhost"},
}
for _, tc := range testCases {
a, err := dns.ReverseAddr(tc.wantIP)
require.Nil(t, err)
a = strings.TrimSuffix(a, ".")
hosts := ah.ProcessReverse(a, dns.TypePTR)
require.Len(t, hosts, tc.wantLen)
assert.Equal(t, tc.wantHost, hosts[0])
}
}) </s> remove s, _ := createObject(conf)
e := Entry{}
n := 1000 // number of distinct clients and domains every hour
for h := 0; h != 12; h++ {
if h != 0 {
atomic.AddInt32(&hour, 1)
}
for i := 0; i != n; i++ {
e.Domain = fmt.Sprintf("domain%d", i)
ip := net.IP{127, 0, 0, 1}
ip[2] = byte((i & 0xff00) >> 8)
ip[3] = byte(i & 0xff)
e.Client = ip.String()
e.Result = RNotFiltered
e.Time = 123456
s.Update(e)
</s> add // Number of distinct clients and domains every hour.
const n = 1000
for h := 0; h < 12; h++ {
atomic.AddInt32(&hour, 1)
for i := 0; i < n; i++ {
s.Update(Entry{
Domain: fmt.Sprintf("domain%d", i),
Client: net.IP{
127,
0,
byte((i & 0xff00) >> 8),
byte(i & 0xff),
}.String(),
Result: RNotFiltered,
Time: 123456,
}) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/stats/stats_test.go |
func TestStatsCollector(t *testing.T) {
ng := func(_ *unitDB) uint64 {
return 0 | <mask>
<mask> s.Close()
<mask> }
<mask>
<mask> // this code is a chunk copied from getData() that generates aggregate data per day
<mask> func aggregateDataPerDay(firstID uint32) int {
<mask> firstDayID := (firstID + 24 - 1) / 24 * 24 // align_ceil(24)
<mask> a := []uint64{}
<mask> var sum uint64
<mask> id := firstDayID
<mask> nextDayID := firstDayID + 24
<mask> for i := firstDayID - firstID; int(i) != 720; i++ {
<mask> sum++
<mask> if id == nextDayID {
<mask> a = append(a, sum)
<mask> sum = 0
<mask> nextDayID += 24
<mask> }
<mask> id++
<mask> }
<mask> if id <= nextDayID {
<mask> a = append(a, sum)
<mask> }
<mask> return len(a)
<mask> }
<mask>
<mask> func TestAggregateDataPerTimeUnit(t *testing.T) {
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove assert.True(t, ok)
assert.EqualValues(t, int(hour)*n, d.NumDNSQueries)
s.Close()
</s> add require.True(t, ok)
assert.EqualValues(t, hour*n, d.NumDNSQueries) </s> remove // per time unit counters:
// 720 hours may span 31 days, so we skip data for the first day in this case
firstDayID := (firstID + 24 - 1) / 24 * 24 // align_ceil(24)
statsCollector := func(numsGetter func(u *unitDB) (num uint64)) (nums []uint64) {
if timeUnit == Hours {
for _, u := range units {
nums = append(nums, numsGetter(u))
}
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := int(firstDayID - firstID); i != len(units); i++ {
sum += numsGetter(units[i])
if id == nextDayID {
nums = append(nums, sum)
sum = 0
nextDayID += 24
}
id++
}
if id <= nextDayID {
nums = append(nums, sum)
}
}
return nums
}
topsCollector := func(max int, pairsGetter func(u *unitDB) (pairs []countPair)) []map[string]uint64 {
m := map[string]uint64{}
for _, u := range units {
for _, it := range pairsGetter(u) {
m[it.Name] += it.Count
}
}
a2 := convertMapToSlice(m, max)
return convertTopSlice(a2)
}
dnsQueries := statsCollector(func(u *unitDB) (num uint64) { return u.NTotal })
</s> add dnsQueries := statsCollector(units, firstID, timeUnit, func(u *unitDB) (num uint64) { return u.NTotal }) </s> remove return len(a)
}
</s> add units := make([]*unitDB, 720) </s> remove // total counters:
sum := unitDB{}
sum.NResult = make([]uint64, rLast)
</s> add // Total counters:
sum := unitDB{
NResult: make([]uint64, rLast),
} </s> remove func TestAggregateDataPerTimeUnit(t *testing.T) {
for i := 0; i != 25; i++ {
alen := aggregateDataPerDay(uint32(i))
assert.Equalf(t, 30, alen, "i=%d", i)
}
</s> add t.Run("hours", func(t *testing.T) {
statsData := statsCollector(units, 0, Hours, ng)
assert.Len(t, statsData, 720)
})
t.Run("days", func(t *testing.T) {
for i := 0; i != 25; i++ {
statsData := statsCollector(units, uint32(i), Days, ng)
require.Lenf(t, statsData, 30, "i=%d", i)
}
}) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"k... | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/stats/stats_test.go |
units := make([]*unitDB, 720) | <mask> }
<mask> if id <= nextDayID {
<mask> a = append(a, sum)
<mask> }
<mask> return len(a)
<mask> }
<mask>
<mask> func TestAggregateDataPerTimeUnit(t *testing.T) {
<mask> for i := 0; i != 25; i++ {
<mask> alen := aggregateDataPerDay(uint32(i))
<mask> assert.Equalf(t, 30, alen, "i=%d", i)
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove func TestAggregateDataPerTimeUnit(t *testing.T) {
for i := 0; i != 25; i++ {
alen := aggregateDataPerDay(uint32(i))
assert.Equalf(t, 30, alen, "i=%d", i)
}
</s> add t.Run("hours", func(t *testing.T) {
statsData := statsCollector(units, 0, Hours, ng)
assert.Len(t, statsData, 720)
})
t.Run("days", func(t *testing.T) {
for i := 0; i != 25; i++ {
statsData := statsCollector(units, uint32(i), Days, ng)
require.Lenf(t, statsData, 30, "i=%d", i)
}
}) </s> remove // this code is a chunk copied from getData() that generates aggregate data per day
func aggregateDataPerDay(firstID uint32) int {
firstDayID := (firstID + 24 - 1) / 24 * 24 // align_ceil(24)
a := []uint64{}
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != 720; i++ {
sum++
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
}
id++
}
if id <= nextDayID {
a = append(a, sum)
</s> add func TestStatsCollector(t *testing.T) {
ng := func(_ *unitDB) uint64 {
return 0 </s> remove // per time unit counters:
// 720 hours may span 31 days, so we skip data for the first day in this case
firstDayID := (firstID + 24 - 1) / 24 * 24 // align_ceil(24)
statsCollector := func(numsGetter func(u *unitDB) (num uint64)) (nums []uint64) {
if timeUnit == Hours {
for _, u := range units {
nums = append(nums, numsGetter(u))
}
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := int(firstDayID - firstID); i != len(units); i++ {
sum += numsGetter(units[i])
if id == nextDayID {
nums = append(nums, sum)
sum = 0
nextDayID += 24
}
id++
}
if id <= nextDayID {
nums = append(nums, sum)
}
}
return nums
}
topsCollector := func(max int, pairsGetter func(u *unitDB) (pairs []countPair)) []map[string]uint64 {
m := map[string]uint64{}
for _, u := range units {
for _, it := range pairsGetter(u) {
m[it.Name] += it.Count
}
}
a2 := convertMapToSlice(m, max)
return convertTopSlice(a2)
}
dnsQueries := statsCollector(func(u *unitDB) (num uint64) { return u.NTotal })
</s> add dnsQueries := statsCollector(units, firstID, timeUnit, func(u *unitDB) (num uint64) { return u.NTotal }) </s> remove s, _ := createObject(conf)
e := Entry{}
n := 1000 // number of distinct clients and domains every hour
for h := 0; h != 12; h++ {
if h != 0 {
atomic.AddInt32(&hour, 1)
}
for i := 0; i != n; i++ {
e.Domain = fmt.Sprintf("domain%d", i)
ip := net.IP{127, 0, 0, 1}
ip[2] = byte((i & 0xff00) >> 8)
ip[3] = byte(i & 0xff)
e.Client = ip.String()
e.Result = RNotFiltered
e.Time = 123456
s.Update(e)
</s> add // Number of distinct clients and domains every hour.
const n = 1000
for h := 0; h < 12; h++ {
atomic.AddInt32(&hour, 1)
for i := 0; i < n; i++ {
s.Update(Entry{
Domain: fmt.Sprintf("domain%d", i),
Client: net.IP{
127,
0,
byte((i & 0xff00) >> 8),
byte(i & 0xff),
}.String(),
Result: RNotFiltered,
Time: 123456,
}) </s> remove BaseDir: prepareTestDir(t),
</s> add BaseDir: aghtest.PrepareTestDir(t), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/stats/stats_test.go |
t.Run("hours", func(t *testing.T) {
statsData := statsCollector(units, 0, Hours, ng)
assert.Len(t, statsData, 720)
})
t.Run("days", func(t *testing.T) {
for i := 0; i != 25; i++ {
statsData := statsCollector(units, uint32(i), Days, ng)
require.Lenf(t, statsData, 30, "i=%d", i)
}
}) | <mask> }
<mask> return len(a)
<mask> }
<mask>
<mask> func TestAggregateDataPerTimeUnit(t *testing.T) {
<mask> for i := 0; i != 25; i++ {
<mask> alen := aggregateDataPerDay(uint32(i))
<mask> assert.Equalf(t, 30, alen, "i=%d", i)
<mask> }
<mask> }
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove return len(a)
}
</s> add units := make([]*unitDB, 720) </s> remove s, _ := createObject(conf)
e := Entry{}
n := 1000 // number of distinct clients and domains every hour
for h := 0; h != 12; h++ {
if h != 0 {
atomic.AddInt32(&hour, 1)
}
for i := 0; i != n; i++ {
e.Domain = fmt.Sprintf("domain%d", i)
ip := net.IP{127, 0, 0, 1}
ip[2] = byte((i & 0xff00) >> 8)
ip[3] = byte(i & 0xff)
e.Client = ip.String()
e.Result = RNotFiltered
e.Time = 123456
s.Update(e)
</s> add // Number of distinct clients and domains every hour.
const n = 1000
for h := 0; h < 12; h++ {
atomic.AddInt32(&hour, 1)
for i := 0; i < n; i++ {
s.Update(Entry{
Domain: fmt.Sprintf("domain%d", i),
Client: net.IP{
127,
0,
byte((i & 0xff00) >> 8),
byte(i & 0xff),
}.String(),
Result: RNotFiltered,
Time: 123456,
}) </s> remove // this code is a chunk copied from getData() that generates aggregate data per day
func aggregateDataPerDay(firstID uint32) int {
firstDayID := (firstID + 24 - 1) / 24 * 24 // align_ceil(24)
a := []uint64{}
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != 720; i++ {
sum++
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
}
id++
}
if id <= nextDayID {
a = append(a, sum)
</s> add func TestStatsCollector(t *testing.T) {
ng := func(_ *unitDB) uint64 {
return 0 </s> remove // per time unit counters:
// 720 hours may span 31 days, so we skip data for the first day in this case
firstDayID := (firstID + 24 - 1) / 24 * 24 // align_ceil(24)
statsCollector := func(numsGetter func(u *unitDB) (num uint64)) (nums []uint64) {
if timeUnit == Hours {
for _, u := range units {
nums = append(nums, numsGetter(u))
}
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := int(firstDayID - firstID); i != len(units); i++ {
sum += numsGetter(units[i])
if id == nextDayID {
nums = append(nums, sum)
sum = 0
nextDayID += 24
}
id++
}
if id <= nextDayID {
nums = append(nums, sum)
}
}
return nums
}
topsCollector := func(max int, pairsGetter func(u *unitDB) (pairs []countPair)) []map[string]uint64 {
m := map[string]uint64{}
for _, u := range units {
for _, it := range pairsGetter(u) {
m[it.Name] += it.Count
}
}
a2 := convertMapToSlice(m, max)
return convertTopSlice(a2)
}
dnsQueries := statsCollector(func(u *unitDB) (num uint64) { return u.NTotal })
</s> add dnsQueries := statsCollector(units, firstID, timeUnit, func(u *unitDB) (num uint64) { return u.NTotal }) </s> remove BaseDir: prepareTestDir(t),
</s> add BaseDir: aghtest.PrepareTestDir(t), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/stats/stats_test.go |
dnsQueries := statsCollector(units, firstID, timeUnit, func(u *unitDB) (num uint64) { return u.NTotal }) | <mask> if units == nil {
<mask> return statsResponse{}, false
<mask> }
<mask>
<mask> // per time unit counters:
<mask> // 720 hours may span 31 days, so we skip data for the first day in this case
<mask> firstDayID := (firstID + 24 - 1) / 24 * 24 // align_ceil(24)
<mask>
<mask> statsCollector := func(numsGetter func(u *unitDB) (num uint64)) (nums []uint64) {
<mask> if timeUnit == Hours {
<mask> for _, u := range units {
<mask> nums = append(nums, numsGetter(u))
<mask> }
<mask> } else {
<mask> var sum uint64
<mask> id := firstDayID
<mask> nextDayID := firstDayID + 24
<mask> for i := int(firstDayID - firstID); i != len(units); i++ {
<mask> sum += numsGetter(units[i])
<mask> if id == nextDayID {
<mask> nums = append(nums, sum)
<mask> sum = 0
<mask> nextDayID += 24
<mask> }
<mask> id++
<mask> }
<mask> if id <= nextDayID {
<mask> nums = append(nums, sum)
<mask> }
<mask> }
<mask> return nums
<mask> }
<mask>
<mask> topsCollector := func(max int, pairsGetter func(u *unitDB) (pairs []countPair)) []map[string]uint64 {
<mask> m := map[string]uint64{}
<mask> for _, u := range units {
<mask> for _, it := range pairsGetter(u) {
<mask> m[it.Name] += it.Count
<mask> }
<mask> }
<mask> a2 := convertMapToSlice(m, max)
<mask> return convertTopSlice(a2)
<mask> }
<mask>
<mask> dnsQueries := statsCollector(func(u *unitDB) (num uint64) { return u.NTotal })
<mask> if timeUnit != Hours && len(dnsQueries) != int(limit/24) {
<mask> log.Fatalf("len(dnsQueries) != limit: %d %d", len(dnsQueries), limit)
<mask> }
<mask>
<mask> data := statsResponse{
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove // this code is a chunk copied from getData() that generates aggregate data per day
func aggregateDataPerDay(firstID uint32) int {
firstDayID := (firstID + 24 - 1) / 24 * 24 // align_ceil(24)
a := []uint64{}
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != 720; i++ {
sum++
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
}
id++
}
if id <= nextDayID {
a = append(a, sum)
</s> add func TestStatsCollector(t *testing.T) {
ng := func(_ *unitDB) uint64 {
return 0 </s> remove // total counters:
sum := unitDB{}
sum.NResult = make([]uint64, rLast)
</s> add // Total counters:
sum := unitDB{
NResult: make([]uint64, rLast),
} </s> remove return len(a)
}
</s> add units := make([]*unitDB, 720) </s> remove assert.True(t, ok)
assert.EqualValues(t, int(hour)*n, d.NumDNSQueries)
s.Close()
</s> add require.True(t, ok)
assert.EqualValues(t, hour*n, d.NumDNSQueries) </s> remove BlockedFiltering: statsCollector(func(u *unitDB) (num uint64) { return u.NResult[RFiltered] }),
ReplacedSafebrowsing: statsCollector(func(u *unitDB) (num uint64) { return u.NResult[RSafeBrowsing] }),
ReplacedParental: statsCollector(func(u *unitDB) (num uint64) { return u.NResult[RParental] }),
TopQueried: topsCollector(maxDomains, func(u *unitDB) (pairs []countPair) { return u.Domains }),
TopBlocked: topsCollector(maxDomains, func(u *unitDB) (pairs []countPair) { return u.BlockedDomains }),
TopClients: topsCollector(maxClients, func(u *unitDB) (pairs []countPair) { return u.Clients }),
</s> add BlockedFiltering: statsCollector(units, firstID, timeUnit, func(u *unitDB) (num uint64) { return u.NResult[RFiltered] }),
ReplacedSafebrowsing: statsCollector(units, firstID, timeUnit, func(u *unitDB) (num uint64) { return u.NResult[RSafeBrowsing] }),
ReplacedParental: statsCollector(units, firstID, timeUnit, func(u *unitDB) (num uint64) { return u.NResult[RParental] }),
TopQueried: topsCollector(units, maxDomains, func(u *unitDB) (pairs []countPair) { return u.Domains }),
TopBlocked: topsCollector(units, maxDomains, func(u *unitDB) (pairs []countPair) { return u.BlockedDomains }),
TopClients: topsCollector(units, maxClients, func(u *unitDB) (pairs []countPair) { return u.Clients }), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"re... | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/stats/unit.go |
BlockedFiltering: statsCollector(units, firstID, timeUnit, func(u *unitDB) (num uint64) { return u.NResult[RFiltered] }),
ReplacedSafebrowsing: statsCollector(units, firstID, timeUnit, func(u *unitDB) (num uint64) { return u.NResult[RSafeBrowsing] }),
ReplacedParental: statsCollector(units, firstID, timeUnit, func(u *unitDB) (num uint64) { return u.NResult[RParental] }),
TopQueried: topsCollector(units, maxDomains, func(u *unitDB) (pairs []countPair) { return u.Domains }),
TopBlocked: topsCollector(units, maxDomains, func(u *unitDB) (pairs []countPair) { return u.BlockedDomains }),
TopClients: topsCollector(units, maxClients, func(u *unitDB) (pairs []countPair) { return u.Clients }), | <mask> }
<mask>
<mask> data := statsResponse{
<mask> DNSQueries: dnsQueries,
<mask> BlockedFiltering: statsCollector(func(u *unitDB) (num uint64) { return u.NResult[RFiltered] }),
<mask> ReplacedSafebrowsing: statsCollector(func(u *unitDB) (num uint64) { return u.NResult[RSafeBrowsing] }),
<mask> ReplacedParental: statsCollector(func(u *unitDB) (num uint64) { return u.NResult[RParental] }),
<mask> TopQueried: topsCollector(maxDomains, func(u *unitDB) (pairs []countPair) { return u.Domains }),
<mask> TopBlocked: topsCollector(maxDomains, func(u *unitDB) (pairs []countPair) { return u.BlockedDomains }),
<mask> TopClients: topsCollector(maxClients, func(u *unitDB) (pairs []countPair) { return u.Clients }),
<mask> }
<mask>
<mask> // total counters:
<mask>
<mask> sum := unitDB{}
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove // total counters:
sum := unitDB{}
sum.NResult = make([]uint64, rLast)
</s> add // Total counters:
sum := unitDB{
NResult: make([]uint64, rLast),
} </s> remove // per time unit counters:
// 720 hours may span 31 days, so we skip data for the first day in this case
firstDayID := (firstID + 24 - 1) / 24 * 24 // align_ceil(24)
statsCollector := func(numsGetter func(u *unitDB) (num uint64)) (nums []uint64) {
if timeUnit == Hours {
for _, u := range units {
nums = append(nums, numsGetter(u))
}
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := int(firstDayID - firstID); i != len(units); i++ {
sum += numsGetter(units[i])
if id == nextDayID {
nums = append(nums, sum)
sum = 0
nextDayID += 24
}
id++
}
if id <= nextDayID {
nums = append(nums, sum)
}
}
return nums
}
topsCollector := func(max int, pairsGetter func(u *unitDB) (pairs []countPair)) []map[string]uint64 {
m := map[string]uint64{}
for _, u := range units {
for _, it := range pairsGetter(u) {
m[it.Name] += it.Count
}
}
a2 := convertMapToSlice(m, max)
return convertTopSlice(a2)
}
dnsQueries := statsCollector(func(u *unitDB) (num uint64) { return u.NTotal })
</s> add dnsQueries := statsCollector(units, firstID, timeUnit, func(u *unitDB) (num uint64) { return u.NTotal }) </s> remove // this code is a chunk copied from getData() that generates aggregate data per day
func aggregateDataPerDay(firstID uint32) int {
firstDayID := (firstID + 24 - 1) / 24 * 24 // align_ceil(24)
a := []uint64{}
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != 720; i++ {
sum++
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
}
id++
}
if id <= nextDayID {
a = append(a, sum)
</s> add func TestStatsCollector(t *testing.T) {
ng := func(_ *unitDB) uint64 {
return 0 </s> remove func prepareTestDir() string {
const dir = "./agh-test"
_ = os.RemoveAll(dir)
_ = os.MkdirAll(dir, 0o755)
return dir
</s> add func prepareTestFile(t *testing.T) (f *os.File) {
t.Helper()
dir := aghtest.PrepareTestDir(t)
f, err := ioutil.TempFile(dir, "")
require.Nil(t, err)
require.NotNil(t, f)
t.Cleanup(func() {
assert.Nil(t, f.Close())
})
return f </s> remove return len(a)
}
</s> add units := make([]*unitDB, 720) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/stats/unit.go |
// Total counters:
sum := unitDB{
NResult: make([]uint64, rLast),
} | <mask> TopBlocked: topsCollector(maxDomains, func(u *unitDB) (pairs []countPair) { return u.BlockedDomains }),
<mask> TopClients: topsCollector(maxClients, func(u *unitDB) (pairs []countPair) { return u.Clients }),
<mask> }
<mask>
<mask> // total counters:
<mask>
<mask> sum := unitDB{}
<mask> sum.NResult = make([]uint64, rLast)
<mask> timeN := 0
<mask> for _, u := range units {
<mask> sum.NTotal += u.NTotal
<mask> sum.TimeAvg += u.TimeAvg
<mask> if u.TimeAvg != 0 {
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove BlockedFiltering: statsCollector(func(u *unitDB) (num uint64) { return u.NResult[RFiltered] }),
ReplacedSafebrowsing: statsCollector(func(u *unitDB) (num uint64) { return u.NResult[RSafeBrowsing] }),
ReplacedParental: statsCollector(func(u *unitDB) (num uint64) { return u.NResult[RParental] }),
TopQueried: topsCollector(maxDomains, func(u *unitDB) (pairs []countPair) { return u.Domains }),
TopBlocked: topsCollector(maxDomains, func(u *unitDB) (pairs []countPair) { return u.BlockedDomains }),
TopClients: topsCollector(maxClients, func(u *unitDB) (pairs []countPair) { return u.Clients }),
</s> add BlockedFiltering: statsCollector(units, firstID, timeUnit, func(u *unitDB) (num uint64) { return u.NResult[RFiltered] }),
ReplacedSafebrowsing: statsCollector(units, firstID, timeUnit, func(u *unitDB) (num uint64) { return u.NResult[RSafeBrowsing] }),
ReplacedParental: statsCollector(units, firstID, timeUnit, func(u *unitDB) (num uint64) { return u.NResult[RParental] }),
TopQueried: topsCollector(units, maxDomains, func(u *unitDB) (pairs []countPair) { return u.Domains }),
TopBlocked: topsCollector(units, maxDomains, func(u *unitDB) (pairs []countPair) { return u.BlockedDomains }),
TopClients: topsCollector(units, maxClients, func(u *unitDB) (pairs []countPair) { return u.Clients }), </s> remove // per time unit counters:
// 720 hours may span 31 days, so we skip data for the first day in this case
firstDayID := (firstID + 24 - 1) / 24 * 24 // align_ceil(24)
statsCollector := func(numsGetter func(u *unitDB) (num uint64)) (nums []uint64) {
if timeUnit == Hours {
for _, u := range units {
nums = append(nums, numsGetter(u))
}
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := int(firstDayID - firstID); i != len(units); i++ {
sum += numsGetter(units[i])
if id == nextDayID {
nums = append(nums, sum)
sum = 0
nextDayID += 24
}
id++
}
if id <= nextDayID {
nums = append(nums, sum)
}
}
return nums
}
topsCollector := func(max int, pairsGetter func(u *unitDB) (pairs []countPair)) []map[string]uint64 {
m := map[string]uint64{}
for _, u := range units {
for _, it := range pairsGetter(u) {
m[it.Name] += it.Count
}
}
a2 := convertMapToSlice(m, max)
return convertTopSlice(a2)
}
dnsQueries := statsCollector(func(u *unitDB) (num uint64) { return u.NTotal })
</s> add dnsQueries := statsCollector(units, firstID, timeUnit, func(u *unitDB) (num uint64) { return u.NTotal }) </s> remove // this code is a chunk copied from getData() that generates aggregate data per day
func aggregateDataPerDay(firstID uint32) int {
firstDayID := (firstID + 24 - 1) / 24 * 24 // align_ceil(24)
a := []uint64{}
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != 720; i++ {
sum++
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
}
id++
}
if id <= nextDayID {
a = append(a, sum)
</s> add func TestStatsCollector(t *testing.T) {
ng := func(_ *unitDB) uint64 {
return 0 </s> remove return len(a)
}
</s> add units := make([]*unitDB, 720) </s> remove if err != nil {
t.Fatalf("Cannot get net interfaces: %s", err)
}
if len(ifaces) == 0 {
t.Fatalf("No net interfaces found")
}
</s> add require.Nilf(t, err, "Cannot get net interfaces: %s", err)
require.NotEmpty(t, ifaces, "No net interfaces found") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/stats/unit.go |
"github.com/stretchr/testify/require" | <mask>
<mask> "github.com/stretchr/testify/assert"
<mask> )
<mask>
<mask> const nl = "\n"
<mask>
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove func prepareTestFiles(t *testing.T, dir string, filesNum, linesNum int) []string {
</s> add func prepareTestFiles(t *testing.T, filesNum, linesNum int) []string { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/sysutil/net_linux_test.go |
require.Nil(t, err) | <mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> r := bytes.NewReader(tc.data)
<mask> has, err := dhcpcdStaticConfig(r, "wlan0")
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, tc.want, has)
<mask> })
<mask> }
<mask> }
<mask>
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove s = updateStaticIPdhcpcdConf("wlan0", "192.168.0.2/24", nil, net.IP{192, 168, 0, 2})
assert.Equal(t, dhcpcdConf, s)
</s> add for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
s := updateStaticIPdhcpcdConf("wlan0", "192.168.0.2/24", tc.routers, net.IP{192, 168, 0, 2})
assert.Equal(t, tc.dhcpcdConf, s)
})
} </s> remove // Existing host
ips := ah.Process("localhost", dns.TypeA)
assert.NotNil(t, ips)
assert.Len(t, ips, 1)
assert.Equal(t, net.ParseIP("127.0.0.1"), ips[0])
// Unknown host
ips = ah.Process("newhost", dns.TypeA)
assert.Nil(t, ips)
// Unknown host (comment)
ips = ah.Process("comment", dns.TypeA)
assert.Nil(t, ips)
// Test hosts file
table := ah.List()
names, ok := table["127.0.0.1"]
assert.True(t, ok)
assert.Equal(t, []string{"host", "localhost"}, names)
// Test PTR
a, _ := dns.ReverseAddr("127.0.0.1")
a = strings.TrimSuffix(a, ".")
hosts := ah.ProcessReverse(a, dns.TypePTR)
if assert.Len(t, hosts, 2) {
assert.Equal(t, hosts[0], "host")
}
a, _ = dns.ReverseAddr("::1")
a = strings.TrimSuffix(a, ".")
hosts = ah.ProcessReverse(a, dns.TypePTR)
if assert.Len(t, hosts, 1) {
assert.Equal(t, hosts[0], "localhost")
}
</s> add t.Run("existing_host", func(t *testing.T) {
ips := ah.Process("localhost", dns.TypeA)
require.Len(t, ips, 1)
assert.Equal(t, net.IPv4(127, 0, 0, 1), ips[0])
})
t.Run("unknown_host", func(t *testing.T) {
ips := ah.Process("newhost", dns.TypeA)
assert.Nil(t, ips)
// Comment.
ips = ah.Process("comment", dns.TypeA)
assert.Nil(t, ips)
})
t.Run("hosts_file", func(t *testing.T) {
names, ok := ah.List()["127.0.0.1"]
require.True(t, ok)
assert.Equal(t, []string{"host", "localhost"}, names)
})
t.Run("ptr", func(t *testing.T) {
testCases := []struct {
wantIP string
wantLen int
wantHost string
}{
{wantIP: "127.0.0.1", wantLen: 2, wantHost: "host"},
{wantIP: "::1", wantLen: 1, wantHost: "localhost"},
}
for _, tc := range testCases {
a, err := dns.ReverseAddr(tc.wantIP)
require.Nil(t, err)
a = strings.TrimSuffix(a, ".")
hosts := ah.ProcessReverse(a, dns.TypePTR)
require.Len(t, hosts, tc.wantLen)
assert.Equal(t, tc.wantHost, hosts[0])
}
}) </s> remove func TestIP(t *testing.T) {
assert.True(t, net.IP{127, 0, 0, 1}.Equal(DNSUnreverseAddr("1.0.0.127.in-addr.arpa")))
assert.Equal(t, "::abcd:1234", DNSUnreverseAddr("4.3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa").String())
assert.Equal(t, "::abcd:1234", DNSUnreverseAddr("4.3.2.1.d.c.B.A.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa").String())
assert.Nil(t, DNSUnreverseAddr("1.0.0.127.in-addr.arpa."))
assert.Nil(t, DNSUnreverseAddr(".0.0.127.in-addr.arpa"))
assert.Nil(t, DNSUnreverseAddr(".3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa"))
assert.Nil(t, DNSUnreverseAddr("4.3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0..ip6.arpa"))
assert.Nil(t, DNSUnreverseAddr("4.3.2.1.d.c.b. .0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa"))
</s> add func TestDNSReverseAddr(t *testing.T) {
testCases := []struct {
name string
have string
want net.IP
}{{
name: "good_ipv4",
have: "1.0.0.127.in-addr.arpa",
want: net.IP{127, 0, 0, 1},
}, {
name: "good_ipv6",
have: "4.3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa",
want: net.ParseIP("::abcd:1234"),
}, {
name: "good_ipv6_case",
have: "4.3.2.1.d.c.B.A.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa",
want: net.ParseIP("::abcd:1234"),
}, {
name: "bad_ipv4_dot",
have: "1.0.0.127.in-addr.arpa.",
}, {
name: "wrong_ipv4",
have: ".0.0.127.in-addr.arpa",
}, {
name: "wrong_ipv6",
have: ".3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa",
}, {
name: "bad_ipv6_dot",
have: "4.3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0..ip6.arpa",
}, {
name: "bad_ipv6_space",
have: "4.3.2.1.d.c.b. .0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa",
}}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
ip := DNSUnreverseAddr(tc.have)
assert.True(t, tc.want.Equal(ip))
})
} </s> remove dir := prepareTestDir()
defer func() { _ = os.RemoveAll(dir) }()
</s> add for _, str := range strs {
n, err := f.WriteString(str)
require.Nil(t, err)
assert.Equal(t, n, len(str))
}
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/sysutil/net_linux_test.go |
require.Nil(t, err) | <mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> r := bytes.NewReader(tc.data)
<mask> has, err := ifacesStaticConfig(r, "enp0s3")
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, tc.want, has)
<mask> })
<mask> }
<mask> }
<mask>
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove s = updateStaticIPdhcpcdConf("wlan0", "192.168.0.2/24", nil, net.IP{192, 168, 0, 2})
assert.Equal(t, dhcpcdConf, s)
</s> add for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
s := updateStaticIPdhcpcdConf("wlan0", "192.168.0.2/24", tc.routers, net.IP{192, 168, 0, 2})
assert.Equal(t, tc.dhcpcdConf, s)
})
} </s> remove // Existing host
ips := ah.Process("localhost", dns.TypeA)
assert.NotNil(t, ips)
assert.Len(t, ips, 1)
assert.Equal(t, net.ParseIP("127.0.0.1"), ips[0])
// Unknown host
ips = ah.Process("newhost", dns.TypeA)
assert.Nil(t, ips)
// Unknown host (comment)
ips = ah.Process("comment", dns.TypeA)
assert.Nil(t, ips)
// Test hosts file
table := ah.List()
names, ok := table["127.0.0.1"]
assert.True(t, ok)
assert.Equal(t, []string{"host", "localhost"}, names)
// Test PTR
a, _ := dns.ReverseAddr("127.0.0.1")
a = strings.TrimSuffix(a, ".")
hosts := ah.ProcessReverse(a, dns.TypePTR)
if assert.Len(t, hosts, 2) {
assert.Equal(t, hosts[0], "host")
}
a, _ = dns.ReverseAddr("::1")
a = strings.TrimSuffix(a, ".")
hosts = ah.ProcessReverse(a, dns.TypePTR)
if assert.Len(t, hosts, 1) {
assert.Equal(t, hosts[0], "localhost")
}
</s> add t.Run("existing_host", func(t *testing.T) {
ips := ah.Process("localhost", dns.TypeA)
require.Len(t, ips, 1)
assert.Equal(t, net.IPv4(127, 0, 0, 1), ips[0])
})
t.Run("unknown_host", func(t *testing.T) {
ips := ah.Process("newhost", dns.TypeA)
assert.Nil(t, ips)
// Comment.
ips = ah.Process("comment", dns.TypeA)
assert.Nil(t, ips)
})
t.Run("hosts_file", func(t *testing.T) {
names, ok := ah.List()["127.0.0.1"]
require.True(t, ok)
assert.Equal(t, []string{"host", "localhost"}, names)
})
t.Run("ptr", func(t *testing.T) {
testCases := []struct {
wantIP string
wantLen int
wantHost string
}{
{wantIP: "127.0.0.1", wantLen: 2, wantHost: "host"},
{wantIP: "::1", wantLen: 1, wantHost: "localhost"},
}
for _, tc := range testCases {
a, err := dns.ReverseAddr(tc.wantIP)
require.Nil(t, err)
a = strings.TrimSuffix(a, ".")
hosts := ah.ProcessReverse(a, dns.TypePTR)
require.Len(t, hosts, tc.wantLen)
assert.Equal(t, tc.wantHost, hosts[0])
}
}) </s> remove func TestIP(t *testing.T) {
assert.True(t, net.IP{127, 0, 0, 1}.Equal(DNSUnreverseAddr("1.0.0.127.in-addr.arpa")))
assert.Equal(t, "::abcd:1234", DNSUnreverseAddr("4.3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa").String())
assert.Equal(t, "::abcd:1234", DNSUnreverseAddr("4.3.2.1.d.c.B.A.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa").String())
assert.Nil(t, DNSUnreverseAddr("1.0.0.127.in-addr.arpa."))
assert.Nil(t, DNSUnreverseAddr(".0.0.127.in-addr.arpa"))
assert.Nil(t, DNSUnreverseAddr(".3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa"))
assert.Nil(t, DNSUnreverseAddr("4.3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0..ip6.arpa"))
assert.Nil(t, DNSUnreverseAddr("4.3.2.1.d.c.b. .0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa"))
</s> add func TestDNSReverseAddr(t *testing.T) {
testCases := []struct {
name string
have string
want net.IP
}{{
name: "good_ipv4",
have: "1.0.0.127.in-addr.arpa",
want: net.IP{127, 0, 0, 1},
}, {
name: "good_ipv6",
have: "4.3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa",
want: net.ParseIP("::abcd:1234"),
}, {
name: "good_ipv6_case",
have: "4.3.2.1.d.c.B.A.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa",
want: net.ParseIP("::abcd:1234"),
}, {
name: "bad_ipv4_dot",
have: "1.0.0.127.in-addr.arpa.",
}, {
name: "wrong_ipv4",
have: ".0.0.127.in-addr.arpa",
}, {
name: "wrong_ipv6",
have: ".3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa",
}, {
name: "bad_ipv6_dot",
have: "4.3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0..ip6.arpa",
}, {
name: "bad_ipv6_space",
have: "4.3.2.1.d.c.b. .0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa",
}}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
ip := DNSUnreverseAddr(tc.have)
assert.True(t, tc.want.Equal(ip))
})
} </s> remove dir := prepareTestDir()
defer func() { _ = os.RemoveAll(dir) }()
</s> add for _, str := range strs {
n, err := f.WriteString(str)
require.Nil(t, err)
assert.Equal(t, n, len(str))
}
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/sysutil/net_linux_test.go |
testCases := []struct {
name string
dhcpcdConf string
routers net.IP
}{{
name: "with_gateway",
dhcpcdConf: nl + `interface wlan0` + nl +
`static ip_address=192.168.0.2/24` + nl +
`static routers=192.168.0.1` + nl +
`static domain_name_servers=192.168.0.2` + nl + nl,
routers: net.IP{192, 168, 0, 1},
}, {
name: "without_gateway",
dhcpcdConf: nl + `interface wlan0` + nl +
`static ip_address=192.168.0.2/24` + nl +
`static domain_name_servers=192.168.0.2` + nl + nl,
routers: nil,
}} | <mask> }
<mask> }
<mask>
<mask> func TestSetStaticIPdhcpcdConf(t *testing.T) {
<mask> dhcpcdConf := nl + `interface wlan0` + nl +
<mask> `static ip_address=192.168.0.2/24` + nl +
<mask> `static routers=192.168.0.1` + nl +
<mask> `static domain_name_servers=192.168.0.2` + nl + nl
<mask>
<mask> s := updateStaticIPdhcpcdConf("wlan0", "192.168.0.2/24", net.IP{192, 168, 0, 1}, net.IP{192, 168, 0, 2})
<mask> assert.Equal(t, dhcpcdConf, s)
<mask>
<mask> // without gateway
<mask> dhcpcdConf = nl + `interface wlan0` + nl +
<mask> `static ip_address=192.168.0.2/24` + nl +
<mask> `static domain_name_servers=192.168.0.2` + nl + nl
<mask>
<mask> s = updateStaticIPdhcpcdConf("wlan0", "192.168.0.2/24", nil, net.IP{192, 168, 0, 2})
<mask> assert.Equal(t, dhcpcdConf, s)
<mask> }
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove s = updateStaticIPdhcpcdConf("wlan0", "192.168.0.2/24", nil, net.IP{192, 168, 0, 2})
assert.Equal(t, dhcpcdConf, s)
</s> add for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
s := updateStaticIPdhcpcdConf("wlan0", "192.168.0.2/24", tc.routers, net.IP{192, 168, 0, 2})
assert.Equal(t, tc.dhcpcdConf, s)
})
} </s> remove func prepareTestFiles(t *testing.T, dir string, filesNum, linesNum int) []string {
</s> add func prepareTestFiles(t *testing.T, filesNum, linesNum int) []string { </s> remove // this code is a chunk copied from getData() that generates aggregate data per day
func aggregateDataPerDay(firstID uint32) int {
firstDayID := (firstID + 24 - 1) / 24 * 24 // align_ceil(24)
a := []uint64{}
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != 720; i++ {
sum++
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
}
id++
}
if id <= nextDayID {
a = append(a, sum)
</s> add func TestStatsCollector(t *testing.T) {
ng := func(_ *unitDB) uint64 {
return 0 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/sysutil/net_linux_test.go |
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
s := updateStaticIPdhcpcdConf("wlan0", "192.168.0.2/24", tc.routers, net.IP{192, 168, 0, 2})
assert.Equal(t, tc.dhcpcdConf, s)
})
} | <mask> dhcpcdConf = nl + `interface wlan0` + nl +
<mask> `static ip_address=192.168.0.2/24` + nl +
<mask> `static domain_name_servers=192.168.0.2` + nl + nl
<mask>
<mask> s = updateStaticIPdhcpcdConf("wlan0", "192.168.0.2/24", nil, net.IP{192, 168, 0, 2})
<mask> assert.Equal(t, dhcpcdConf, s)
<mask> }
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove dhcpcdConf := nl + `interface wlan0` + nl +
`static ip_address=192.168.0.2/24` + nl +
`static routers=192.168.0.1` + nl +
`static domain_name_servers=192.168.0.2` + nl + nl
s := updateStaticIPdhcpcdConf("wlan0", "192.168.0.2/24", net.IP{192, 168, 0, 1}, net.IP{192, 168, 0, 2})
assert.Equal(t, dhcpcdConf, s)
// without gateway
dhcpcdConf = nl + `interface wlan0` + nl +
`static ip_address=192.168.0.2/24` + nl +
`static domain_name_servers=192.168.0.2` + nl + nl
</s> add testCases := []struct {
name string
dhcpcdConf string
routers net.IP
}{{
name: "with_gateway",
dhcpcdConf: nl + `interface wlan0` + nl +
`static ip_address=192.168.0.2/24` + nl +
`static routers=192.168.0.1` + nl +
`static domain_name_servers=192.168.0.2` + nl + nl,
routers: net.IP{192, 168, 0, 1},
}, {
name: "without_gateway",
dhcpcdConf: nl + `interface wlan0` + nl +
`static ip_address=192.168.0.2/24` + nl +
`static domain_name_servers=192.168.0.2` + nl + nl,
routers: nil,
}} </s> remove func prepareTestFiles(t *testing.T, dir string, filesNum, linesNum int) []string {
</s> add func prepareTestFiles(t *testing.T, filesNum, linesNum int) []string { </s> remove // this code is a chunk copied from getData() that generates aggregate data per day
func aggregateDataPerDay(firstID uint32) int {
firstDayID := (firstID + 24 - 1) / 24 * 24 // align_ceil(24)
a := []uint64{}
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != 720; i++ {
sum++
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
}
id++
}
if id <= nextDayID {
a = append(a, sum)
</s> add func TestStatsCollector(t *testing.T) {
ng := func(_ *unitDB) uint64 {
return 0 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/sysutil/net_linux_test.go |
"github.com/stretchr/testify/require" | <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghtest"
<mask> "github.com/miekg/dns"
<mask> "github.com/stretchr/testify/assert"
<mask> )
<mask>
<mask> func TestMain(m *testing.M) {
<mask> aghtest.DiscardLogOutput(m)
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove func prepareTestDir() string {
const dir = "./agh-test"
_ = os.RemoveAll(dir)
_ = os.MkdirAll(dir, 0o755)
return dir
</s> add func prepareTestFile(t *testing.T) (f *os.File) {
t.Helper()
dir := aghtest.PrepareTestDir(t)
f, err := ioutil.TempFile(dir, "")
require.Nil(t, err)
require.NotNil(t, f)
t.Cleanup(func() {
assert.Nil(t, f.Close())
})
return f </s> remove func prepareTestDir(t *testing.T) string {
t.Helper()
wd, err := os.Getwd()
require.Nil(t, err)
dir, err := ioutil.TempDir(wd, "agh-tests")
require.Nil(t, err)
require.NotEmpty(t, dir)
t.Cleanup(func() {
// TODO(e.burkov): Replace with t.TempDir methods after updating
// go version to 1.15.
start := time.Now()
for {
err := os.RemoveAll(dir)
if err == nil {
break
}
if runtime.GOOS != "windows" || time.Since(start) >= 500*time.Millisecond {
break
}
time.Sleep(5 * time.Millisecond)
}
assert.Nil(t, err)
})
return dir
}
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/util/autohosts_test.go |
func prepareTestFile(t *testing.T) (f *os.File) {
t.Helper()
dir := aghtest.PrepareTestDir(t)
f, err := ioutil.TempFile(dir, "")
require.Nil(t, err)
require.NotNil(t, f)
t.Cleanup(func() {
assert.Nil(t, f.Close())
})
return f | <mask> func TestMain(m *testing.M) {
<mask> aghtest.DiscardLogOutput(m)
<mask> }
<mask>
<mask> func prepareTestDir() string {
<mask> const dir = "./agh-test"
<mask> _ = os.RemoveAll(dir)
<mask> _ = os.MkdirAll(dir, 0o755)
<mask> return dir
<mask> }
<mask>
<mask> func TestAutoHostsResolution(t *testing.T) {
<mask> ah := AutoHosts{}
<mask>
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove func TestAutoHostsResolution(t *testing.T) {
ah := AutoHosts{}
</s> add func assertWriting(t *testing.T, f *os.File, strs ...string) {
t.Helper() </s> remove ah := AutoHosts{}
</s> add ah := &AutoHosts{} </s> remove dir := prepareTestDir()
defer func() { _ = os.RemoveAll(dir) }()
</s> add for _, str := range strs {
n, err := f.WriteString(str)
require.Nil(t, err)
assert.Equal(t, n, len(str))
}
} </s> remove dir := prepareTestDir()
defer func() { _ = os.RemoveAll(dir) }()
</s> add f := prepareTestFile(t) </s> remove f, _ := ioutil.TempFile(dir, "")
defer func() { _ = os.Remove(f.Name()) }()
defer f.Close()
</s> add func TestAutoHostsResolution(t *testing.T) {
ah := &AutoHosts{} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/util/autohosts_test.go |
func assertWriting(t *testing.T, f *os.File, strs ...string) {
t.Helper() | <mask> _ = os.MkdirAll(dir, 0o755)
<mask> return dir
<mask> }
<mask>
<mask> func TestAutoHostsResolution(t *testing.T) {
<mask> ah := AutoHosts{}
<mask>
<mask> dir := prepareTestDir()
<mask> defer func() { _ = os.RemoveAll(dir) }()
<mask>
<mask> f, _ := ioutil.TempFile(dir, "")
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove ah := AutoHosts{}
</s> add ah := &AutoHosts{} </s> remove dir := prepareTestDir()
defer func() { _ = os.RemoveAll(dir) }()
</s> add f := prepareTestFile(t) </s> remove dir := prepareTestDir()
defer func() { _ = os.RemoveAll(dir) }()
</s> add for _, str := range strs {
n, err := f.WriteString(str)
require.Nil(t, err)
assert.Equal(t, n, len(str))
}
} </s> remove func prepareTestDir() string {
const dir = "./agh-test"
_ = os.RemoveAll(dir)
_ = os.MkdirAll(dir, 0o755)
return dir
</s> add func prepareTestFile(t *testing.T) (f *os.File) {
t.Helper()
dir := aghtest.PrepareTestDir(t)
f, err := ioutil.TempFile(dir, "")
require.Nil(t, err)
require.NotNil(t, f)
t.Cleanup(func() {
assert.Nil(t, f.Close())
})
return f </s> remove f, _ := ioutil.TempFile(dir, "")
defer func() { _ = os.Remove(f.Name()) }()
defer f.Close()
</s> add func TestAutoHostsResolution(t *testing.T) {
ah := &AutoHosts{} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/util/autohosts_test.go |
for _, str := range strs {
n, err := f.WriteString(str)
require.Nil(t, err)
assert.Equal(t, n, len(str))
}
} | <mask>
<mask> func TestAutoHostsResolution(t *testing.T) {
<mask> ah := AutoHosts{}
<mask>
<mask> dir := prepareTestDir()
<mask> defer func() { _ = os.RemoveAll(dir) }()
<mask>
<mask> f, _ := ioutil.TempFile(dir, "")
<mask> defer func() { _ = os.Remove(f.Name()) }()
<mask> defer f.Close()
<mask>
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove dir := prepareTestDir()
defer func() { _ = os.RemoveAll(dir) }()
</s> add f := prepareTestFile(t) </s> remove f, _ := ioutil.TempFile(dir, "")
defer func() { _ = os.Remove(f.Name()) }()
defer f.Close()
</s> add func TestAutoHostsResolution(t *testing.T) {
ah := &AutoHosts{} </s> remove ah := AutoHosts{}
</s> add ah := &AutoHosts{} </s> remove func TestAutoHostsResolution(t *testing.T) {
ah := AutoHosts{}
</s> add func assertWriting(t *testing.T, f *os.File, strs ...string) {
t.Helper() </s> remove f, _ := ioutil.TempFile(dir, "")
defer func() { _ = os.Remove(f.Name()) }()
defer f.Close()
// Init
_, _ = f.WriteString(" 127.0.0.1 host localhost \n")
</s> add assertWriting(t, f, " 127.0.0.1 host localhost \n") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/util/autohosts_test.go |
func TestAutoHostsResolution(t *testing.T) {
ah := &AutoHosts{} | <mask>
<mask> dir := prepareTestDir()
<mask> defer func() { _ = os.RemoveAll(dir) }()
<mask>
<mask> f, _ := ioutil.TempFile(dir, "")
<mask> defer func() { _ = os.Remove(f.Name()) }()
<mask> defer f.Close()
<mask>
<mask> _, _ = f.WriteString(" 127.0.0.1 host localhost # comment \n")
<mask> _, _ = f.WriteString(" ::1 localhost#comment \n")
<mask>
<mask> ah.Init(f.Name())
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove _, _ = f.WriteString(" 127.0.0.1 host localhost # comment \n")
_, _ = f.WriteString(" ::1 localhost#comment \n")
</s> add f := prepareTestFile(t) </s> remove f, _ := ioutil.TempFile(dir, "")
defer func() { _ = os.Remove(f.Name()) }()
defer f.Close()
// Init
_, _ = f.WriteString(" 127.0.0.1 host localhost \n")
</s> add assertWriting(t, f, " 127.0.0.1 host localhost \n") </s> remove dir := prepareTestDir()
defer func() { _ = os.RemoveAll(dir) }()
</s> add f := prepareTestFile(t) </s> remove dir := prepareTestDir()
defer func() { _ = os.RemoveAll(dir) }()
</s> add for _, str := range strs {
n, err := f.WriteString(str)
require.Nil(t, err)
assert.Equal(t, n, len(str))
}
} </s> remove ah := AutoHosts{}
</s> add ah := &AutoHosts{} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/util/autohosts_test.go |
f := prepareTestFile(t) | <mask> f, _ := ioutil.TempFile(dir, "")
<mask> defer func() { _ = os.Remove(f.Name()) }()
<mask> defer f.Close()
<mask>
<mask> _, _ = f.WriteString(" 127.0.0.1 host localhost # comment \n")
<mask> _, _ = f.WriteString(" ::1 localhost#comment \n")
<mask>
<mask> ah.Init(f.Name())
<mask>
<mask> // Existing host
<mask> ips := ah.Process("localhost", dns.TypeA)
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove f, _ := ioutil.TempFile(dir, "")
defer func() { _ = os.Remove(f.Name()) }()
defer f.Close()
</s> add func TestAutoHostsResolution(t *testing.T) {
ah := &AutoHosts{} </s> remove f, _ := ioutil.TempFile(dir, "")
defer func() { _ = os.Remove(f.Name()) }()
defer f.Close()
// Init
_, _ = f.WriteString(" 127.0.0.1 host localhost \n")
</s> add assertWriting(t, f, " 127.0.0.1 host localhost \n") </s> remove // Unknown host
ips := ah.Process("newhost", dns.TypeA)
assert.Nil(t, ips)
</s> add t.Run("unknown_host", func(t *testing.T) {
ips := ah.Process("newhost", dns.TypeA)
assert.Nil(t, ips)
}) </s> remove dir := prepareTestDir()
defer func() { _ = os.RemoveAll(dir) }()
</s> add f := prepareTestFile(t) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/util/autohosts_test.go |
assertWriting(t, f,
" 127.0.0.1 host localhost # comment \n",
" ::1 localhost#comment \n",
) | <mask>
<mask> f := prepareTestFile(t)
<mask>
<mask> ah.Init(f.Name())
<mask>
<mask> t.Run("existing_host", func(t *testing.T) {
<mask> ips := ah.Process("localhost", dns.TypeA)
<mask> require.Len(t, ips, 1)
<mask> assert.Equal(t, net.IPv4(127, 0, 0, 1), ips[0])
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove // Existing host
ips := ah.Process("localhost", dns.TypeA)
assert.NotNil(t, ips)
assert.Len(t, ips, 1)
assert.Equal(t, net.ParseIP("127.0.0.1"), ips[0])
// Unknown host
ips = ah.Process("newhost", dns.TypeA)
assert.Nil(t, ips)
// Unknown host (comment)
ips = ah.Process("comment", dns.TypeA)
assert.Nil(t, ips)
// Test hosts file
table := ah.List()
names, ok := table["127.0.0.1"]
assert.True(t, ok)
assert.Equal(t, []string{"host", "localhost"}, names)
// Test PTR
a, _ := dns.ReverseAddr("127.0.0.1")
a = strings.TrimSuffix(a, ".")
hosts := ah.ProcessReverse(a, dns.TypePTR)
if assert.Len(t, hosts, 2) {
assert.Equal(t, hosts[0], "host")
}
a, _ = dns.ReverseAddr("::1")
a = strings.TrimSuffix(a, ".")
hosts = ah.ProcessReverse(a, dns.TypePTR)
if assert.Len(t, hosts, 1) {
assert.Equal(t, hosts[0], "localhost")
}
</s> add t.Run("existing_host", func(t *testing.T) {
ips := ah.Process("localhost", dns.TypeA)
require.Len(t, ips, 1)
assert.Equal(t, net.IPv4(127, 0, 0, 1), ips[0])
})
t.Run("unknown_host", func(t *testing.T) {
ips := ah.Process("newhost", dns.TypeA)
assert.Nil(t, ips)
// Comment.
ips = ah.Process("comment", dns.TypeA)
assert.Nil(t, ips)
})
t.Run("hosts_file", func(t *testing.T) {
names, ok := ah.List()["127.0.0.1"]
require.True(t, ok)
assert.Equal(t, []string{"host", "localhost"}, names)
})
t.Run("ptr", func(t *testing.T) {
testCases := []struct {
wantIP string
wantLen int
wantHost string
}{
{wantIP: "127.0.0.1", wantLen: 2, wantHost: "host"},
{wantIP: "::1", wantLen: 1, wantHost: "localhost"},
}
for _, tc := range testCases {
a, err := dns.ReverseAddr(tc.wantIP)
require.Nil(t, err)
a = strings.TrimSuffix(a, ".")
hosts := ah.ProcessReverse(a, dns.TypePTR)
require.Len(t, hosts, tc.wantLen)
assert.Equal(t, tc.wantHost, hosts[0])
}
}) </s> remove // Check if we are notified about changes
ips = ah.Process("newhost", dns.TypeA)
assert.NotNil(t, ips)
assert.Len(t, ips, 1)
assert.True(t, net.IP{127, 0, 0, 2}.Equal(ips[0]))
</s> add t.Run("notified", func(t *testing.T) {
ips := ah.Process("newhost", dns.TypeA)
assert.NotNil(t, ips)
require.Len(t, ips, 1)
assert.True(t, net.IP{127, 0, 0, 2}.Equal(ips[0]))
}) </s> remove _, _ = f.WriteString(" 127.0.0.1 host localhost # comment \n")
_, _ = f.WriteString(" ::1 localhost#comment \n")
</s> add f := prepareTestFile(t) </s> remove // Unknown host
ips := ah.Process("newhost", dns.TypeA)
assert.Nil(t, ips)
</s> add t.Run("unknown_host", func(t *testing.T) {
ips := ah.Process("newhost", dns.TypeA)
assert.Nil(t, ips)
}) </s> remove func TestIP(t *testing.T) {
assert.True(t, net.IP{127, 0, 0, 1}.Equal(DNSUnreverseAddr("1.0.0.127.in-addr.arpa")))
assert.Equal(t, "::abcd:1234", DNSUnreverseAddr("4.3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa").String())
assert.Equal(t, "::abcd:1234", DNSUnreverseAddr("4.3.2.1.d.c.B.A.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa").String())
assert.Nil(t, DNSUnreverseAddr("1.0.0.127.in-addr.arpa."))
assert.Nil(t, DNSUnreverseAddr(".0.0.127.in-addr.arpa"))
assert.Nil(t, DNSUnreverseAddr(".3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa"))
assert.Nil(t, DNSUnreverseAddr("4.3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0..ip6.arpa"))
assert.Nil(t, DNSUnreverseAddr("4.3.2.1.d.c.b. .0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa"))
</s> add func TestDNSReverseAddr(t *testing.T) {
testCases := []struct {
name string
have string
want net.IP
}{{
name: "good_ipv4",
have: "1.0.0.127.in-addr.arpa",
want: net.IP{127, 0, 0, 1},
}, {
name: "good_ipv6",
have: "4.3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa",
want: net.ParseIP("::abcd:1234"),
}, {
name: "good_ipv6_case",
have: "4.3.2.1.d.c.B.A.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa",
want: net.ParseIP("::abcd:1234"),
}, {
name: "bad_ipv4_dot",
have: "1.0.0.127.in-addr.arpa.",
}, {
name: "wrong_ipv4",
have: ".0.0.127.in-addr.arpa",
}, {
name: "wrong_ipv6",
have: ".3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa",
}, {
name: "bad_ipv6_dot",
have: "4.3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0..ip6.arpa",
}, {
name: "bad_ipv6_space",
have: "4.3.2.1.d.c.b. .0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa",
}}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
ip := DNSUnreverseAddr(tc.have)
assert.True(t, tc.want.Equal(ip))
})
} | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/util/autohosts_test.go |
t.Run("existing_host", func(t *testing.T) {
ips := ah.Process("localhost", dns.TypeA)
require.Len(t, ips, 1)
assert.Equal(t, net.IPv4(127, 0, 0, 1), ips[0])
})
t.Run("unknown_host", func(t *testing.T) {
ips := ah.Process("newhost", dns.TypeA)
assert.Nil(t, ips)
// Comment.
ips = ah.Process("comment", dns.TypeA)
assert.Nil(t, ips)
})
t.Run("hosts_file", func(t *testing.T) {
names, ok := ah.List()["127.0.0.1"]
require.True(t, ok)
assert.Equal(t, []string{"host", "localhost"}, names)
})
t.Run("ptr", func(t *testing.T) {
testCases := []struct {
wantIP string
wantLen int
wantHost string
}{
{wantIP: "127.0.0.1", wantLen: 2, wantHost: "host"},
{wantIP: "::1", wantLen: 1, wantHost: "localhost"},
}
for _, tc := range testCases {
a, err := dns.ReverseAddr(tc.wantIP)
require.Nil(t, err)
a = strings.TrimSuffix(a, ".")
hosts := ah.ProcessReverse(a, dns.TypePTR)
require.Len(t, hosts, tc.wantLen)
assert.Equal(t, tc.wantHost, hosts[0])
}
}) | <mask> _, _ = f.WriteString(" ::1 localhost#comment \n")
<mask>
<mask> ah.Init(f.Name())
<mask>
<mask> // Existing host
<mask> ips := ah.Process("localhost", dns.TypeA)
<mask> assert.NotNil(t, ips)
<mask> assert.Len(t, ips, 1)
<mask> assert.Equal(t, net.ParseIP("127.0.0.1"), ips[0])
<mask>
<mask> // Unknown host
<mask> ips = ah.Process("newhost", dns.TypeA)
<mask> assert.Nil(t, ips)
<mask>
<mask> // Unknown host (comment)
<mask> ips = ah.Process("comment", dns.TypeA)
<mask> assert.Nil(t, ips)
<mask>
<mask> // Test hosts file
<mask> table := ah.List()
<mask> names, ok := table["127.0.0.1"]
<mask> assert.True(t, ok)
<mask> assert.Equal(t, []string{"host", "localhost"}, names)
<mask>
<mask> // Test PTR
<mask> a, _ := dns.ReverseAddr("127.0.0.1")
<mask> a = strings.TrimSuffix(a, ".")
<mask> hosts := ah.ProcessReverse(a, dns.TypePTR)
<mask> if assert.Len(t, hosts, 2) {
<mask> assert.Equal(t, hosts[0], "host")
<mask> }
<mask>
<mask> a, _ = dns.ReverseAddr("::1")
<mask> a = strings.TrimSuffix(a, ".")
<mask> hosts = ah.ProcessReverse(a, dns.TypePTR)
<mask> if assert.Len(t, hosts, 1) {
<mask> assert.Equal(t, hosts[0], "localhost")
<mask> }
<mask> }
<mask>
<mask> func TestAutoHostsFSNotify(t *testing.T) {
<mask> ah := AutoHosts{}
<mask>
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove // Unknown host
ips := ah.Process("newhost", dns.TypeA)
assert.Nil(t, ips)
</s> add t.Run("unknown_host", func(t *testing.T) {
ips := ah.Process("newhost", dns.TypeA)
assert.Nil(t, ips)
}) </s> remove f, _ := ioutil.TempFile(dir, "")
defer func() { _ = os.Remove(f.Name()) }()
defer f.Close()
// Init
_, _ = f.WriteString(" 127.0.0.1 host localhost \n")
</s> add assertWriting(t, f, " 127.0.0.1 host localhost \n") </s> remove _, _ = f.WriteString(" 127.0.0.1 host localhost # comment \n")
_, _ = f.WriteString(" ::1 localhost#comment \n")
</s> add f := prepareTestFile(t) </s> remove // Check if we are notified about changes
ips = ah.Process("newhost", dns.TypeA)
assert.NotNil(t, ips)
assert.Len(t, ips, 1)
assert.True(t, net.IP{127, 0, 0, 2}.Equal(ips[0]))
</s> add t.Run("notified", func(t *testing.T) {
ips := ah.Process("newhost", dns.TypeA)
assert.NotNil(t, ips)
require.Len(t, ips, 1)
assert.True(t, net.IP{127, 0, 0, 2}.Equal(ips[0]))
}) </s> remove // Stat monitoring for changes
</s> add // Start monitoring for changes. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"re... | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/util/autohosts_test.go |
ah := &AutoHosts{} | <mask> }
<mask> }
<mask>
<mask> func TestAutoHostsFSNotify(t *testing.T) {
<mask> ah := AutoHosts{}
<mask>
<mask> dir := prepareTestDir()
<mask> defer func() { _ = os.RemoveAll(dir) }()
<mask>
<mask> f, _ := ioutil.TempFile(dir, "")
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove dir := prepareTestDir()
defer func() { _ = os.RemoveAll(dir) }()
</s> add f := prepareTestFile(t) </s> remove dir := prepareTestDir()
defer func() { _ = os.RemoveAll(dir) }()
</s> add for _, str := range strs {
n, err := f.WriteString(str)
require.Nil(t, err)
assert.Equal(t, n, len(str))
}
} </s> remove func TestAutoHostsResolution(t *testing.T) {
ah := AutoHosts{}
</s> add func assertWriting(t *testing.T, f *os.File, strs ...string) {
t.Helper() </s> remove f, _ := ioutil.TempFile(dir, "")
defer func() { _ = os.Remove(f.Name()) }()
defer f.Close()
</s> add func TestAutoHostsResolution(t *testing.T) {
ah := &AutoHosts{} </s> remove f, _ := ioutil.TempFile(dir, "")
defer func() { _ = os.Remove(f.Name()) }()
defer f.Close()
// Init
_, _ = f.WriteString(" 127.0.0.1 host localhost \n")
</s> add assertWriting(t, f, " 127.0.0.1 host localhost \n") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/util/autohosts_test.go |
f := prepareTestFile(t) | <mask>
<mask> func TestAutoHostsFSNotify(t *testing.T) {
<mask> ah := AutoHosts{}
<mask>
<mask> dir := prepareTestDir()
<mask> defer func() { _ = os.RemoveAll(dir) }()
<mask>
<mask> f, _ := ioutil.TempFile(dir, "")
<mask> defer func() { _ = os.Remove(f.Name()) }()
<mask> defer f.Close()
<mask>
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove dir := prepareTestDir()
defer func() { _ = os.RemoveAll(dir) }()
</s> add for _, str := range strs {
n, err := f.WriteString(str)
require.Nil(t, err)
assert.Equal(t, n, len(str))
}
} </s> remove ah := AutoHosts{}
</s> add ah := &AutoHosts{} </s> remove f, _ := ioutil.TempFile(dir, "")
defer func() { _ = os.Remove(f.Name()) }()
defer f.Close()
</s> add func TestAutoHostsResolution(t *testing.T) {
ah := &AutoHosts{} </s> remove f, _ := ioutil.TempFile(dir, "")
defer func() { _ = os.Remove(f.Name()) }()
defer f.Close()
// Init
_, _ = f.WriteString(" 127.0.0.1 host localhost \n")
</s> add assertWriting(t, f, " 127.0.0.1 host localhost \n") </s> remove func TestAutoHostsResolution(t *testing.T) {
ah := AutoHosts{}
</s> add func assertWriting(t *testing.T, f *os.File, strs ...string) {
t.Helper() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/util/autohosts_test.go |
assertWriting(t, f, " 127.0.0.1 host localhost \n") | <mask>
<mask> dir := prepareTestDir()
<mask> defer func() { _ = os.RemoveAll(dir) }()
<mask>
<mask> f, _ := ioutil.TempFile(dir, "")
<mask> defer func() { _ = os.Remove(f.Name()) }()
<mask> defer f.Close()
<mask>
<mask> // Init
<mask> _, _ = f.WriteString(" 127.0.0.1 host localhost \n")
<mask> ah.Init(f.Name())
<mask>
<mask> // Unknown host
<mask> ips := ah.Process("newhost", dns.TypeA)
<mask> assert.Nil(t, ips)
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove f, _ := ioutil.TempFile(dir, "")
defer func() { _ = os.Remove(f.Name()) }()
defer f.Close()
</s> add func TestAutoHostsResolution(t *testing.T) {
ah := &AutoHosts{} </s> remove _, _ = f.WriteString(" 127.0.0.1 host localhost # comment \n")
_, _ = f.WriteString(" ::1 localhost#comment \n")
</s> add f := prepareTestFile(t) </s> remove // Unknown host
ips := ah.Process("newhost", dns.TypeA)
assert.Nil(t, ips)
</s> add t.Run("unknown_host", func(t *testing.T) {
ips := ah.Process("newhost", dns.TypeA)
assert.Nil(t, ips)
}) </s> remove dir := prepareTestDir()
defer func() { _ = os.RemoveAll(dir) }()
</s> add f := prepareTestFile(t) </s> remove dir := prepareTestDir()
defer func() { _ = os.RemoveAll(dir) }()
</s> add for _, str := range strs {
n, err := f.WriteString(str)
require.Nil(t, err)
assert.Equal(t, n, len(str))
}
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/util/autohosts_test.go |
t.Run("unknown_host", func(t *testing.T) {
ips := ah.Process("newhost", dns.TypeA)
assert.Nil(t, ips)
}) | <mask> // Init
<mask> _, _ = f.WriteString(" 127.0.0.1 host localhost \n")
<mask> ah.Init(f.Name())
<mask>
<mask> // Unknown host
<mask> ips := ah.Process("newhost", dns.TypeA)
<mask> assert.Nil(t, ips)
<mask>
<mask> // Stat monitoring for changes
<mask> ah.Start()
<mask> defer ah.Close()
<mask>
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove f, _ := ioutil.TempFile(dir, "")
defer func() { _ = os.Remove(f.Name()) }()
defer f.Close()
// Init
_, _ = f.WriteString(" 127.0.0.1 host localhost \n")
</s> add assertWriting(t, f, " 127.0.0.1 host localhost \n") </s> remove // Stat monitoring for changes
</s> add // Start monitoring for changes. </s> remove _, _ = f.WriteString(" 127.0.0.1 host localhost # comment \n")
_, _ = f.WriteString(" ::1 localhost#comment \n")
</s> add f := prepareTestFile(t) </s> remove defer ah.Close()
</s> add t.Cleanup(ah.Close) </s> remove f, _ := ioutil.TempFile(dir, "")
defer func() { _ = os.Remove(f.Name()) }()
defer f.Close()
</s> add func TestAutoHostsResolution(t *testing.T) {
ah := &AutoHosts{} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/util/autohosts_test.go |
// Start monitoring for changes. | <mask> // Unknown host
<mask> ips := ah.Process("newhost", dns.TypeA)
<mask> assert.Nil(t, ips)
<mask>
<mask> // Stat monitoring for changes
<mask> ah.Start()
<mask> defer ah.Close()
<mask>
<mask> // Update file
<mask> _, _ = f.WriteString("127.0.0.2 newhost\n")
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove defer ah.Close()
</s> add t.Cleanup(ah.Close) </s> remove // Unknown host
ips := ah.Process("newhost", dns.TypeA)
assert.Nil(t, ips)
</s> add t.Run("unknown_host", func(t *testing.T) {
ips := ah.Process("newhost", dns.TypeA)
assert.Nil(t, ips)
}) </s> remove // Update file
_, _ = f.WriteString("127.0.0.2 newhost\n")
_ = f.Sync()
</s> add assertWriting(t, f, "127.0.0.2 newhost\n")
require.Nil(t, f.Sync()) </s> remove // wait until fsnotify has triggerred and processed the file-modification event
</s> add // Wait until fsnotify has triggerred and processed the
// file-modification event. </s> remove f, _ := ioutil.TempFile(dir, "")
defer func() { _ = os.Remove(f.Name()) }()
defer f.Close()
// Init
_, _ = f.WriteString(" 127.0.0.1 host localhost \n")
</s> add assertWriting(t, f, " 127.0.0.1 host localhost \n") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/util/autohosts_test.go |
t.Cleanup(ah.Close) | <mask> assert.Nil(t, ips)
<mask>
<mask> // Stat monitoring for changes
<mask> ah.Start()
<mask> defer ah.Close()
<mask>
<mask> // Update file
<mask> _, _ = f.WriteString("127.0.0.2 newhost\n")
<mask> _ = f.Sync()
<mask>
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove // Stat monitoring for changes
</s> add // Start monitoring for changes. </s> remove // Update file
_, _ = f.WriteString("127.0.0.2 newhost\n")
_ = f.Sync()
</s> add assertWriting(t, f, "127.0.0.2 newhost\n")
require.Nil(t, f.Sync()) </s> remove // Unknown host
ips := ah.Process("newhost", dns.TypeA)
assert.Nil(t, ips)
</s> add t.Run("unknown_host", func(t *testing.T) {
ips := ah.Process("newhost", dns.TypeA)
assert.Nil(t, ips)
}) </s> remove // wait until fsnotify has triggerred and processed the file-modification event
</s> add // Wait until fsnotify has triggerred and processed the
// file-modification event. </s> remove f, _ := ioutil.TempFile(dir, "")
defer func() { _ = os.Remove(f.Name()) }()
defer f.Close()
// Init
_, _ = f.WriteString(" 127.0.0.1 host localhost \n")
</s> add assertWriting(t, f, " 127.0.0.1 host localhost \n") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/util/autohosts_test.go |
assertWriting(t, f, "127.0.0.2 newhost\n")
require.Nil(t, f.Sync()) | <mask> // Stat monitoring for changes
<mask> ah.Start()
<mask> defer ah.Close()
<mask>
<mask> // Update file
<mask> _, _ = f.WriteString("127.0.0.2 newhost\n")
<mask> _ = f.Sync()
<mask>
<mask> // wait until fsnotify has triggerred and processed the file-modification event
<mask> time.Sleep(50 * time.Millisecond)
<mask>
<mask> // Check if we are notified about changes
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove // wait until fsnotify has triggerred and processed the file-modification event
</s> add // Wait until fsnotify has triggerred and processed the
// file-modification event. </s> remove defer ah.Close()
</s> add t.Cleanup(ah.Close) </s> remove // Check if we are notified about changes
ips = ah.Process("newhost", dns.TypeA)
assert.NotNil(t, ips)
assert.Len(t, ips, 1)
assert.True(t, net.IP{127, 0, 0, 2}.Equal(ips[0]))
</s> add t.Run("notified", func(t *testing.T) {
ips := ah.Process("newhost", dns.TypeA)
assert.NotNil(t, ips)
require.Len(t, ips, 1)
assert.True(t, net.IP{127, 0, 0, 2}.Equal(ips[0]))
}) </s> remove // Stat monitoring for changes
</s> add // Start monitoring for changes. </s> remove // Unknown host
ips := ah.Process("newhost", dns.TypeA)
assert.Nil(t, ips)
</s> add t.Run("unknown_host", func(t *testing.T) {
ips := ah.Process("newhost", dns.TypeA)
assert.Nil(t, ips)
}) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/util/autohosts_test.go |
// Wait until fsnotify has triggerred and processed the
// file-modification event. | <mask> // Update file
<mask> _, _ = f.WriteString("127.0.0.2 newhost\n")
<mask> _ = f.Sync()
<mask>
<mask> // wait until fsnotify has triggerred and processed the file-modification event
<mask> time.Sleep(50 * time.Millisecond)
<mask>
<mask> // Check if we are notified about changes
<mask> ips = ah.Process("newhost", dns.TypeA)
<mask> assert.NotNil(t, ips)
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove // Update file
_, _ = f.WriteString("127.0.0.2 newhost\n")
_ = f.Sync()
</s> add assertWriting(t, f, "127.0.0.2 newhost\n")
require.Nil(t, f.Sync()) </s> remove // Check if we are notified about changes
ips = ah.Process("newhost", dns.TypeA)
assert.NotNil(t, ips)
assert.Len(t, ips, 1)
assert.True(t, net.IP{127, 0, 0, 2}.Equal(ips[0]))
</s> add t.Run("notified", func(t *testing.T) {
ips := ah.Process("newhost", dns.TypeA)
assert.NotNil(t, ips)
require.Len(t, ips, 1)
assert.True(t, net.IP{127, 0, 0, 2}.Equal(ips[0]))
}) </s> remove defer ah.Close()
</s> add t.Cleanup(ah.Close) </s> remove // Stat monitoring for changes
</s> add // Start monitoring for changes. </s> remove // Unknown host
ips := ah.Process("newhost", dns.TypeA)
assert.Nil(t, ips)
</s> add t.Run("unknown_host", func(t *testing.T) {
ips := ah.Process("newhost", dns.TypeA)
assert.Nil(t, ips)
}) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/util/autohosts_test.go |
t.Run("notified", func(t *testing.T) {
ips := ah.Process("newhost", dns.TypeA)
assert.NotNil(t, ips)
require.Len(t, ips, 1)
assert.True(t, net.IP{127, 0, 0, 2}.Equal(ips[0]))
}) | <mask>
<mask> // wait until fsnotify has triggerred and processed the file-modification event
<mask> time.Sleep(50 * time.Millisecond)
<mask>
<mask> // Check if we are notified about changes
<mask> ips = ah.Process("newhost", dns.TypeA)
<mask> assert.NotNil(t, ips)
<mask> assert.Len(t, ips, 1)
<mask> assert.True(t, net.IP{127, 0, 0, 2}.Equal(ips[0]))
<mask> }
<mask>
<mask> func TestIP(t *testing.T) {
<mask> assert.True(t, net.IP{127, 0, 0, 1}.Equal(DNSUnreverseAddr("1.0.0.127.in-addr.arpa")))
<mask> assert.Equal(t, "::abcd:1234", DNSUnreverseAddr("4.3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa").String())
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove // wait until fsnotify has triggerred and processed the file-modification event
</s> add // Wait until fsnotify has triggerred and processed the
// file-modification event. </s> remove // Update file
_, _ = f.WriteString("127.0.0.2 newhost\n")
_ = f.Sync()
</s> add assertWriting(t, f, "127.0.0.2 newhost\n")
require.Nil(t, f.Sync()) </s> remove func TestIP(t *testing.T) {
assert.True(t, net.IP{127, 0, 0, 1}.Equal(DNSUnreverseAddr("1.0.0.127.in-addr.arpa")))
assert.Equal(t, "::abcd:1234", DNSUnreverseAddr("4.3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa").String())
assert.Equal(t, "::abcd:1234", DNSUnreverseAddr("4.3.2.1.d.c.B.A.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa").String())
assert.Nil(t, DNSUnreverseAddr("1.0.0.127.in-addr.arpa."))
assert.Nil(t, DNSUnreverseAddr(".0.0.127.in-addr.arpa"))
assert.Nil(t, DNSUnreverseAddr(".3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa"))
assert.Nil(t, DNSUnreverseAddr("4.3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0..ip6.arpa"))
assert.Nil(t, DNSUnreverseAddr("4.3.2.1.d.c.b. .0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa"))
</s> add func TestDNSReverseAddr(t *testing.T) {
testCases := []struct {
name string
have string
want net.IP
}{{
name: "good_ipv4",
have: "1.0.0.127.in-addr.arpa",
want: net.IP{127, 0, 0, 1},
}, {
name: "good_ipv6",
have: "4.3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa",
want: net.ParseIP("::abcd:1234"),
}, {
name: "good_ipv6_case",
have: "4.3.2.1.d.c.B.A.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa",
want: net.ParseIP("::abcd:1234"),
}, {
name: "bad_ipv4_dot",
have: "1.0.0.127.in-addr.arpa.",
}, {
name: "wrong_ipv4",
have: ".0.0.127.in-addr.arpa",
}, {
name: "wrong_ipv6",
have: ".3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa",
}, {
name: "bad_ipv6_dot",
have: "4.3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0..ip6.arpa",
}, {
name: "bad_ipv6_space",
have: "4.3.2.1.d.c.b. .0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa",
}}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
ip := DNSUnreverseAddr(tc.have)
assert.True(t, tc.want.Equal(ip))
})
} </s> remove // Existing host
ips := ah.Process("localhost", dns.TypeA)
assert.NotNil(t, ips)
assert.Len(t, ips, 1)
assert.Equal(t, net.ParseIP("127.0.0.1"), ips[0])
// Unknown host
ips = ah.Process("newhost", dns.TypeA)
assert.Nil(t, ips)
// Unknown host (comment)
ips = ah.Process("comment", dns.TypeA)
assert.Nil(t, ips)
// Test hosts file
table := ah.List()
names, ok := table["127.0.0.1"]
assert.True(t, ok)
assert.Equal(t, []string{"host", "localhost"}, names)
// Test PTR
a, _ := dns.ReverseAddr("127.0.0.1")
a = strings.TrimSuffix(a, ".")
hosts := ah.ProcessReverse(a, dns.TypePTR)
if assert.Len(t, hosts, 2) {
assert.Equal(t, hosts[0], "host")
}
a, _ = dns.ReverseAddr("::1")
a = strings.TrimSuffix(a, ".")
hosts = ah.ProcessReverse(a, dns.TypePTR)
if assert.Len(t, hosts, 1) {
assert.Equal(t, hosts[0], "localhost")
}
</s> add t.Run("existing_host", func(t *testing.T) {
ips := ah.Process("localhost", dns.TypeA)
require.Len(t, ips, 1)
assert.Equal(t, net.IPv4(127, 0, 0, 1), ips[0])
})
t.Run("unknown_host", func(t *testing.T) {
ips := ah.Process("newhost", dns.TypeA)
assert.Nil(t, ips)
// Comment.
ips = ah.Process("comment", dns.TypeA)
assert.Nil(t, ips)
})
t.Run("hosts_file", func(t *testing.T) {
names, ok := ah.List()["127.0.0.1"]
require.True(t, ok)
assert.Equal(t, []string{"host", "localhost"}, names)
})
t.Run("ptr", func(t *testing.T) {
testCases := []struct {
wantIP string
wantLen int
wantHost string
}{
{wantIP: "127.0.0.1", wantLen: 2, wantHost: "host"},
{wantIP: "::1", wantLen: 1, wantHost: "localhost"},
}
for _, tc := range testCases {
a, err := dns.ReverseAddr(tc.wantIP)
require.Nil(t, err)
a = strings.TrimSuffix(a, ".")
hosts := ah.ProcessReverse(a, dns.TypePTR)
require.Len(t, hosts, tc.wantLen)
assert.Equal(t, tc.wantHost, hosts[0])
}
}) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/util/autohosts_test.go |
func TestDNSReverseAddr(t *testing.T) {
testCases := []struct {
name string
have string
want net.IP
}{{
name: "good_ipv4",
have: "1.0.0.127.in-addr.arpa",
want: net.IP{127, 0, 0, 1},
}, {
name: "good_ipv6",
have: "4.3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa",
want: net.ParseIP("::abcd:1234"),
}, {
name: "good_ipv6_case",
have: "4.3.2.1.d.c.B.A.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa",
want: net.ParseIP("::abcd:1234"),
}, {
name: "bad_ipv4_dot",
have: "1.0.0.127.in-addr.arpa.",
}, {
name: "wrong_ipv4",
have: ".0.0.127.in-addr.arpa",
}, {
name: "wrong_ipv6",
have: ".3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa",
}, {
name: "bad_ipv6_dot",
have: "4.3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0..ip6.arpa",
}, {
name: "bad_ipv6_space",
have: "4.3.2.1.d.c.b. .0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa",
}}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
ip := DNSUnreverseAddr(tc.have)
assert.True(t, tc.want.Equal(ip))
})
} | <mask> assert.Len(t, ips, 1)
<mask> assert.True(t, net.IP{127, 0, 0, 2}.Equal(ips[0]))
<mask> }
<mask>
<mask> func TestIP(t *testing.T) {
<mask> assert.True(t, net.IP{127, 0, 0, 1}.Equal(DNSUnreverseAddr("1.0.0.127.in-addr.arpa")))
<mask> assert.Equal(t, "::abcd:1234", DNSUnreverseAddr("4.3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa").String())
<mask> assert.Equal(t, "::abcd:1234", DNSUnreverseAddr("4.3.2.1.d.c.B.A.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa").String())
<mask>
<mask> assert.Nil(t, DNSUnreverseAddr("1.0.0.127.in-addr.arpa."))
<mask> assert.Nil(t, DNSUnreverseAddr(".0.0.127.in-addr.arpa"))
<mask> assert.Nil(t, DNSUnreverseAddr(".3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa"))
<mask> assert.Nil(t, DNSUnreverseAddr("4.3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0..ip6.arpa"))
<mask> assert.Nil(t, DNSUnreverseAddr("4.3.2.1.d.c.b. .0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa"))
<mask> }
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove // Check if we are notified about changes
ips = ah.Process("newhost", dns.TypeA)
assert.NotNil(t, ips)
assert.Len(t, ips, 1)
assert.True(t, net.IP{127, 0, 0, 2}.Equal(ips[0]))
</s> add t.Run("notified", func(t *testing.T) {
ips := ah.Process("newhost", dns.TypeA)
assert.NotNil(t, ips)
require.Len(t, ips, 1)
assert.True(t, net.IP{127, 0, 0, 2}.Equal(ips[0]))
}) </s> remove // Existing host
ips := ah.Process("localhost", dns.TypeA)
assert.NotNil(t, ips)
assert.Len(t, ips, 1)
assert.Equal(t, net.ParseIP("127.0.0.1"), ips[0])
// Unknown host
ips = ah.Process("newhost", dns.TypeA)
assert.Nil(t, ips)
// Unknown host (comment)
ips = ah.Process("comment", dns.TypeA)
assert.Nil(t, ips)
// Test hosts file
table := ah.List()
names, ok := table["127.0.0.1"]
assert.True(t, ok)
assert.Equal(t, []string{"host", "localhost"}, names)
// Test PTR
a, _ := dns.ReverseAddr("127.0.0.1")
a = strings.TrimSuffix(a, ".")
hosts := ah.ProcessReverse(a, dns.TypePTR)
if assert.Len(t, hosts, 2) {
assert.Equal(t, hosts[0], "host")
}
a, _ = dns.ReverseAddr("::1")
a = strings.TrimSuffix(a, ".")
hosts = ah.ProcessReverse(a, dns.TypePTR)
if assert.Len(t, hosts, 1) {
assert.Equal(t, hosts[0], "localhost")
}
</s> add t.Run("existing_host", func(t *testing.T) {
ips := ah.Process("localhost", dns.TypeA)
require.Len(t, ips, 1)
assert.Equal(t, net.IPv4(127, 0, 0, 1), ips[0])
})
t.Run("unknown_host", func(t *testing.T) {
ips := ah.Process("newhost", dns.TypeA)
assert.Nil(t, ips)
// Comment.
ips = ah.Process("comment", dns.TypeA)
assert.Nil(t, ips)
})
t.Run("hosts_file", func(t *testing.T) {
names, ok := ah.List()["127.0.0.1"]
require.True(t, ok)
assert.Equal(t, []string{"host", "localhost"}, names)
})
t.Run("ptr", func(t *testing.T) {
testCases := []struct {
wantIP string
wantLen int
wantHost string
}{
{wantIP: "127.0.0.1", wantLen: 2, wantHost: "host"},
{wantIP: "::1", wantLen: 1, wantHost: "localhost"},
}
for _, tc := range testCases {
a, err := dns.ReverseAddr(tc.wantIP)
require.Nil(t, err)
a = strings.TrimSuffix(a, ".")
hosts := ah.ProcessReverse(a, dns.TypePTR)
require.Len(t, hosts, tc.wantLen)
assert.Equal(t, tc.wantHost, hosts[0])
}
}) </s> remove
s.clear()
s.Close()
</s> add </s> remove s, _ := createObject(conf)
e := Entry{}
e.Domain = "domain"
e.Client = "127.0.0.1"
e.Result = RFiltered
e.Time = 123456
s.Update(e)
e.Domain = "domain"
e.Client = "127.0.0.1"
e.Result = RNotFiltered
e.Time = 123456
s.Update(e)
</s> add s.Update(Entry{
Domain: "domain",
Client: "127.0.0.1",
Result: RFiltered,
Time: 123456,
})
s.Update(Entry{
Domain: "domain",
Client: "127.0.0.1",
Result: RNotFiltered,
Time: 123456,
}) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/util/autohosts_test.go |
"github.com/stretchr/testify/require" | <mask> "testing"
<mask>
<mask> "github.com/stretchr/testify/assert"
<mask> )
<mask>
<mask> func TestSplitNext(t *testing.T) {
<mask> s := " a,b , c "
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove assert.Empty(t, s)
</s> add require.Empty(t, s) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/util/helpers_test.go |
require.Empty(t, s) | <mask> s := " a,b , c "
<mask> assert.Equal(t, "a", SplitNext(&s, ','))
<mask> assert.Equal(t, "b", SplitNext(&s, ','))
<mask> assert.Equal(t, "c", SplitNext(&s, ','))
<mask> assert.Empty(t, s)
<mask> }
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove s = updateStaticIPdhcpcdConf("wlan0", "192.168.0.2/24", nil, net.IP{192, 168, 0, 2})
assert.Equal(t, dhcpcdConf, s)
</s> add for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
s := updateStaticIPdhcpcdConf("wlan0", "192.168.0.2/24", tc.routers, net.IP{192, 168, 0, 2})
assert.Equal(t, tc.dhcpcdConf, s)
})
} </s> remove dhcpcdConf := nl + `interface wlan0` + nl +
`static ip_address=192.168.0.2/24` + nl +
`static routers=192.168.0.1` + nl +
`static domain_name_servers=192.168.0.2` + nl + nl
s := updateStaticIPdhcpcdConf("wlan0", "192.168.0.2/24", net.IP{192, 168, 0, 1}, net.IP{192, 168, 0, 2})
assert.Equal(t, dhcpcdConf, s)
// without gateway
dhcpcdConf = nl + `interface wlan0` + nl +
`static ip_address=192.168.0.2/24` + nl +
`static domain_name_servers=192.168.0.2` + nl + nl
</s> add testCases := []struct {
name string
dhcpcdConf string
routers net.IP
}{{
name: "with_gateway",
dhcpcdConf: nl + `interface wlan0` + nl +
`static ip_address=192.168.0.2/24` + nl +
`static routers=192.168.0.1` + nl +
`static domain_name_servers=192.168.0.2` + nl + nl,
routers: net.IP{192, 168, 0, 1},
}, {
name: "without_gateway",
dhcpcdConf: nl + `interface wlan0` + nl +
`static ip_address=192.168.0.2/24` + nl +
`static domain_name_servers=192.168.0.2` + nl + nl,
routers: nil,
}} </s> remove // Existing host
ips := ah.Process("localhost", dns.TypeA)
assert.NotNil(t, ips)
assert.Len(t, ips, 1)
assert.Equal(t, net.ParseIP("127.0.0.1"), ips[0])
// Unknown host
ips = ah.Process("newhost", dns.TypeA)
assert.Nil(t, ips)
// Unknown host (comment)
ips = ah.Process("comment", dns.TypeA)
assert.Nil(t, ips)
// Test hosts file
table := ah.List()
names, ok := table["127.0.0.1"]
assert.True(t, ok)
assert.Equal(t, []string{"host", "localhost"}, names)
// Test PTR
a, _ := dns.ReverseAddr("127.0.0.1")
a = strings.TrimSuffix(a, ".")
hosts := ah.ProcessReverse(a, dns.TypePTR)
if assert.Len(t, hosts, 2) {
assert.Equal(t, hosts[0], "host")
}
a, _ = dns.ReverseAddr("::1")
a = strings.TrimSuffix(a, ".")
hosts = ah.ProcessReverse(a, dns.TypePTR)
if assert.Len(t, hosts, 1) {
assert.Equal(t, hosts[0], "localhost")
}
</s> add t.Run("existing_host", func(t *testing.T) {
ips := ah.Process("localhost", dns.TypeA)
require.Len(t, ips, 1)
assert.Equal(t, net.IPv4(127, 0, 0, 1), ips[0])
})
t.Run("unknown_host", func(t *testing.T) {
ips := ah.Process("newhost", dns.TypeA)
assert.Nil(t, ips)
// Comment.
ips = ah.Process("comment", dns.TypeA)
assert.Nil(t, ips)
})
t.Run("hosts_file", func(t *testing.T) {
names, ok := ah.List()["127.0.0.1"]
require.True(t, ok)
assert.Equal(t, []string{"host", "localhost"}, names)
})
t.Run("ptr", func(t *testing.T) {
testCases := []struct {
wantIP string
wantLen int
wantHost string
}{
{wantIP: "127.0.0.1", wantLen: 2, wantHost: "host"},
{wantIP: "::1", wantLen: 1, wantHost: "localhost"},
}
for _, tc := range testCases {
a, err := dns.ReverseAddr(tc.wantIP)
require.Nil(t, err)
a = strings.TrimSuffix(a, ".")
hosts := ah.ProcessReverse(a, dns.TypePTR)
require.Len(t, hosts, tc.wantLen)
assert.Equal(t, tc.wantHost, hosts[0])
}
}) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/util/helpers_test.go |
"github.com/stretchr/testify/require" | <mask> package util
<mask>
<mask> import (
<mask> "testing"
<mask> )
<mask>
<mask> func TestGetValidNetInterfacesForWeb(t *testing.T) {
<mask> ifaces, err := GetValidNetInterfacesForWeb()
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove if err != nil {
t.Fatalf("Cannot get net interfaces: %s", err)
}
if len(ifaces) == 0 {
t.Fatalf("No net interfaces found")
}
</s> add require.Nilf(t, err, "Cannot get net interfaces: %s", err)
require.NotEmpty(t, ifaces, "No net interfaces found") </s> remove "io/ioutil"
</s> add </s> remove func prepareTestDir(t *testing.T) string {
t.Helper()
wd, err := os.Getwd()
require.Nil(t, err)
dir, err := ioutil.TempDir(wd, "agh-tests")
require.Nil(t, err)
require.NotEmpty(t, dir)
t.Cleanup(func() {
// TODO(e.burkov): Replace with t.TempDir methods after updating
// go version to 1.15.
start := time.Now()
for {
err := os.RemoveAll(dir)
if err == nil {
break
}
if runtime.GOOS != "windows" || time.Since(start) >= 500*time.Millisecond {
break
}
time.Sleep(5 * time.Millisecond)
}
assert.Nil(t, err)
})
return dir
}
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/util/network_test.go |
require.Nilf(t, err, "Cannot get net interfaces: %s", err)
require.NotEmpty(t, ifaces, "No net interfaces found") | <mask> )
<mask>
<mask> func TestGetValidNetInterfacesForWeb(t *testing.T) {
<mask> ifaces, err := GetValidNetInterfacesForWeb()
<mask> if err != nil {
<mask> t.Fatalf("Cannot get net interfaces: %s", err)
<mask> }
<mask> if len(ifaces) == 0 {
<mask> t.Fatalf("No net interfaces found")
<mask> }
<mask>
<mask> for _, iface := range ifaces {
<mask> if len(iface.Addresses) == 0 {
<mask> t.Fatalf("No addresses found for %s", iface.Name)
<mask> }
<mask>
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove if len(iface.Addresses) == 0 {
t.Fatalf("No addresses found for %s", iface.Name)
}
t.Logf("%v", iface)
</s> add require.NotEmptyf(t, iface.Addresses, "No addresses found for %s", iface.Name) </s> remove // per time unit counters:
// 720 hours may span 31 days, so we skip data for the first day in this case
firstDayID := (firstID + 24 - 1) / 24 * 24 // align_ceil(24)
statsCollector := func(numsGetter func(u *unitDB) (num uint64)) (nums []uint64) {
if timeUnit == Hours {
for _, u := range units {
nums = append(nums, numsGetter(u))
}
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := int(firstDayID - firstID); i != len(units); i++ {
sum += numsGetter(units[i])
if id == nextDayID {
nums = append(nums, sum)
sum = 0
nextDayID += 24
}
id++
}
if id <= nextDayID {
nums = append(nums, sum)
}
}
return nums
}
topsCollector := func(max int, pairsGetter func(u *unitDB) (pairs []countPair)) []map[string]uint64 {
m := map[string]uint64{}
for _, u := range units {
for _, it := range pairsGetter(u) {
m[it.Name] += it.Count
}
}
a2 := convertMapToSlice(m, max)
return convertTopSlice(a2)
}
dnsQueries := statsCollector(func(u *unitDB) (num uint64) { return u.NTotal })
</s> add dnsQueries := statsCollector(units, firstID, timeUnit, func(u *unitDB) (num uint64) { return u.NTotal }) </s> remove func prepareTestDir(t *testing.T) string {
t.Helper()
wd, err := os.Getwd()
require.Nil(t, err)
dir, err := ioutil.TempDir(wd, "agh-tests")
require.Nil(t, err)
require.NotEmpty(t, dir)
t.Cleanup(func() {
// TODO(e.burkov): Replace with t.TempDir methods after updating
// go version to 1.15.
start := time.Now()
for {
err := os.RemoveAll(dir)
if err == nil {
break
}
if runtime.GOOS != "windows" || time.Since(start) >= 500*time.Millisecond {
break
}
time.Sleep(5 * time.Millisecond)
}
assert.Nil(t, err)
})
return dir
}
</s> add </s> remove // this code is a chunk copied from getData() that generates aggregate data per day
func aggregateDataPerDay(firstID uint32) int {
firstDayID := (firstID + 24 - 1) / 24 * 24 // align_ceil(24)
a := []uint64{}
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != 720; i++ {
sum++
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
}
id++
}
if id <= nextDayID {
a = append(a, sum)
</s> add func TestStatsCollector(t *testing.T) {
ng := func(_ *unitDB) uint64 {
return 0 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/util/network_test.go |
require.NotEmptyf(t, iface.Addresses, "No addresses found for %s", iface.Name) | <mask> t.Fatalf("No net interfaces found")
<mask> }
<mask>
<mask> for _, iface := range ifaces {
<mask> if len(iface.Addresses) == 0 {
<mask> t.Fatalf("No addresses found for %s", iface.Name)
<mask> }
<mask>
<mask> t.Logf("%v", iface)
<mask> }
<mask> }
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove if err != nil {
t.Fatalf("Cannot get net interfaces: %s", err)
}
if len(ifaces) == 0 {
t.Fatalf("No net interfaces found")
}
</s> add require.Nilf(t, err, "Cannot get net interfaces: %s", err)
require.NotEmpty(t, ifaces, "No net interfaces found") </s> remove // per time unit counters:
// 720 hours may span 31 days, so we skip data for the first day in this case
firstDayID := (firstID + 24 - 1) / 24 * 24 // align_ceil(24)
statsCollector := func(numsGetter func(u *unitDB) (num uint64)) (nums []uint64) {
if timeUnit == Hours {
for _, u := range units {
nums = append(nums, numsGetter(u))
}
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := int(firstDayID - firstID); i != len(units); i++ {
sum += numsGetter(units[i])
if id == nextDayID {
nums = append(nums, sum)
sum = 0
nextDayID += 24
}
id++
}
if id <= nextDayID {
nums = append(nums, sum)
}
}
return nums
}
topsCollector := func(max int, pairsGetter func(u *unitDB) (pairs []countPair)) []map[string]uint64 {
m := map[string]uint64{}
for _, u := range units {
for _, it := range pairsGetter(u) {
m[it.Name] += it.Count
}
}
a2 := convertMapToSlice(m, max)
return convertTopSlice(a2)
}
dnsQueries := statsCollector(func(u *unitDB) (num uint64) { return u.NTotal })
</s> add dnsQueries := statsCollector(units, firstID, timeUnit, func(u *unitDB) (num uint64) { return u.NTotal }) </s> remove // total counters:
sum := unitDB{}
sum.NResult = make([]uint64, rLast)
</s> add // Total counters:
sum := unitDB{
NResult: make([]uint64, rLast),
} </s> remove // this code is a chunk copied from getData() that generates aggregate data per day
func aggregateDataPerDay(firstID uint32) int {
firstDayID := (firstID + 24 - 1) / 24 * 24 // align_ceil(24)
a := []uint64{}
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != 720; i++ {
sum++
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
}
id++
}
if id <= nextDayID {
a = append(a, sum)
</s> add func TestStatsCollector(t *testing.T) {
ng := func(_ *unitDB) uint64 {
return 0 </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/a3dddd72c1cd864749355c49ef5313a447709638 | internal/util/network_test.go |
//
// TODO(a.garipov): Allow users to set this.
//
// See https://github.com/AdguardTeam/AdGuardHome/issues/3607. | <mask> ServerName string `plist:",omitempty"`
<mask>
<mask> // ServerAddresses is a list IP addresses of the server.
<mask> ServerAddresses []net.IP `plist:",omitempty"`
<mask> }
<mask>
<mask> // payloadContent is a Device Management Profile payload.
<mask> //
</s> Pull request: home: rollback serveraddresses in mobileconfig
Updates #3607.
Squashed commit of the following:
commit 1f0a970b4265a59819ec139e51c98dc9376d995b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Sep 30 13:26:49 2021 +0300
home: rollback serveraddresses in mobileconfig </s> remove
// collectDNSIPs returns a slice of IP addresses the server is listening
// on, including the addresses on all interfaces in cases of unspecified IPs but
// excluding loopback addresses.
func collectDNSIPs() (ips []net.IP, err error) {
// TODO(a.garipov): This really shouldn't be a function that parses
// a list of strings. Instead, we need a function that returns this
// data as []net.IP or []*netutil.IPPort. Maybe someday.
addrs, err := collectDNSAddresses()
if err != nil {
return nil, err
}
for _, addr := range addrs {
ip := net.ParseIP(addr)
if ip != nil && !ip.IsLoopback() {
ips = append(ips, ip)
}
}
return ips, nil
}
</s> add </s> remove dnsIPs, err := collectDNSIPs()
if err != nil {
// Don't add a lot of formatting, since the error is already
// wrapped by collectDNSIPs.
respondJSONError(w, http.StatusInternalServerError, err.Error())
return
}
</s> add </s> remove DNSProtocol: dnsp,
ServerName: host,
ServerAddresses: dnsIPs,
</s> add DNSProtocol: dnsp,
ServerName: host, </s> remove assert.NotEmpty(t, s.ServerAddresses)
</s> add </s> remove assert.NotEmpty(t, s.ServerAddresses)
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a4e078271cec4efad5aea95a32dc46a3d86ea9ca | internal/home/mobileconfig.go |
<mask> return
<mask> }
<mask> }
<mask>
<mask> dnsIPs, err := collectDNSIPs()
<mask> if err != nil {
<mask> // Don't add a lot of formatting, since the error is already
<mask> // wrapped by collectDNSIPs.
<mask> respondJSONError(w, http.StatusInternalServerError, err.Error())
<mask>
<mask> return
<mask> }
<mask>
<mask> d := &dnsSettings{
<mask> DNSProtocol: dnsp,
<mask> ServerName: host,
<mask> ServerAddresses: dnsIPs,
<mask> }
</s> Pull request: home: rollback serveraddresses in mobileconfig
Updates #3607.
Squashed commit of the following:
commit 1f0a970b4265a59819ec139e51c98dc9376d995b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Sep 30 13:26:49 2021 +0300
home: rollback serveraddresses in mobileconfig </s> remove DNSProtocol: dnsp,
ServerName: host,
ServerAddresses: dnsIPs,
</s> add DNSProtocol: dnsp,
ServerName: host, </s> remove
// collectDNSIPs returns a slice of IP addresses the server is listening
// on, including the addresses on all interfaces in cases of unspecified IPs but
// excluding loopback addresses.
func collectDNSIPs() (ips []net.IP, err error) {
// TODO(a.garipov): This really shouldn't be a function that parses
// a list of strings. Instead, we need a function that returns this
// data as []net.IP or []*netutil.IPPort. Maybe someday.
addrs, err := collectDNSAddresses()
if err != nil {
return nil, err
}
for _, addr := range addrs {
ip := net.ParseIP(addr)
if ip != nil && !ip.IsLoopback() {
ips = append(ips, ip)
}
}
return ips, nil
}
</s> add </s> remove assert.NotEmpty(t, s.ServerAddresses)
</s> add </s> remove assert.NotEmpty(t, s.ServerAddresses)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/a4e078271cec4efad5aea95a32dc46a3d86ea9ca | internal/home/mobileconfig.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.