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 |
|---|---|---|---|---|
ClientIP: ipFromAddr(d.Addr), | <mask> Answer: d.Res,
<mask> OrigAnswer: ctx.origResp,
<mask> Result: ctx.result,
<mask> Elapsed: elapsed,
<mask> ClientIP: getIP(d.Addr),
<mask> }
<mask>
<mask> switch d.Proto {
<mask> case proxy.ProtoHTTPS:
<mask> p.ClientProto = querylog.ClientProtoDOH
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove return addr.IP.String()
</s> add return addr.IP </s> remove return addr.IP.String()
</s> add return addr.IP </s> remove return s.genAAAARecord(m, s.conf.BlockingIPAddrv6)
</s> add return s.genAAAARecord(m, s.conf.BlockingIPv6) </s> remove return s.genARecord(m, s.conf.BlockingIPAddrv4)
</s> add return s.genARecord(m, s.conf.BlockingIPv4) </s> remove // Get IP address from net.Addr
func getIP(addr net.Addr) net.IP {
switch addr := addr.(type) {
case *net.UDPAddr:
return addr.IP
case *net.TCPAddr:
return addr.IP
}
return nil
</s> add func stringArrayDup(a []string) []string {
a2 := make([]string, len(a))
copy(a2, a)
return a2 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/stats.go |
// ipFromAddr gets IP address from addr.
func ipFromAddr(addr net.Addr) (ip net.IP) { | <mask>
<mask> "github.com/AdguardTeam/golibs/utils"
<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()
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove return addr.IP.String()
</s> add return addr.IP </s> remove func ipFromAddr(a net.Addr) string {
switch addr := a.(type) {
case *net.UDPAddr:
return addr.IP.String()
case *net.TCPAddr:
return addr.IP.String()
</s> add func IPStringFromAddr(addr net.Addr) (ipstr string) {
if ip := ipFromAddr(addr); ip != nil {
return ip.String() </s> remove return addr.IP.String()
</s> add return addr.IP </s> remove // Get IP address from net.Addr object
</s> add // IPStringFromAddr extracts IP address from net.Addr. </s> remove // Get IP address from net.Addr
func getIP(addr net.Addr) net.IP {
switch addr := addr.(type) {
case *net.UDPAddr:
return addr.IP
case *net.TCPAddr:
return addr.IP
}
return nil
</s> add func stringArrayDup(a []string) []string {
a2 := make([]string, len(a))
copy(a2, a)
return a2 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/util.go |
return addr.IP | <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> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove // GetIPString is a helper function that extracts IP address from net.Addr
func GetIPString(addr net.Addr) string {
</s> add // ipFromAddr gets IP address from addr.
func ipFromAddr(addr net.Addr) (ip net.IP) { </s> remove return addr.IP.String()
</s> add return addr.IP </s> remove func ipFromAddr(a net.Addr) string {
switch addr := a.(type) {
case *net.UDPAddr:
return addr.IP.String()
case *net.TCPAddr:
return addr.IP.String()
</s> add func IPStringFromAddr(addr net.Addr) (ipstr string) {
if ip := ipFromAddr(addr); ip != nil {
return ip.String() </s> remove // Get IP address from net.Addr
func getIP(addr net.Addr) net.IP {
switch addr := addr.(type) {
case *net.UDPAddr:
return addr.IP
case *net.TCPAddr:
return addr.IP
}
return nil
</s> add func stringArrayDup(a []string) []string {
a2 := make([]string, len(a))
copy(a2, a)
return a2 </s> remove // Get IP address from net.Addr object
</s> add // IPStringFromAddr extracts IP address from net.Addr. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/util.go |
return addr.IP | <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> }
<mask>
<mask> func stringArrayDup(a []string) []string {
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove return addr.IP.String()
</s> add return addr.IP </s> remove return ""
}
func stringArrayDup(a []string) []string {
a2 := make([]string, len(a))
copy(a2, a)
return a2
</s> add return nil </s> remove // Get IP address from net.Addr
func getIP(addr net.Addr) net.IP {
switch addr := addr.(type) {
case *net.UDPAddr:
return addr.IP
case *net.TCPAddr:
return addr.IP
}
return nil
</s> add func stringArrayDup(a []string) []string {
a2 := make([]string, len(a))
copy(a2, a)
return a2 </s> remove // GetIPString is a helper function that extracts IP address from net.Addr
func GetIPString(addr net.Addr) string {
</s> add // ipFromAddr gets IP address from addr.
func ipFromAddr(addr net.Addr) (ip net.IP) { </s> remove func ipFromAddr(a net.Addr) string {
switch addr := a.(type) {
case *net.UDPAddr:
return addr.IP.String()
case *net.TCPAddr:
return addr.IP.String()
</s> add func IPStringFromAddr(addr net.Addr) (ipstr string) {
if ip := ipFromAddr(addr); ip != nil {
return ip.String() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/util.go |
return nil | <mask> return addr.IP.String()
<mask> case *net.TCPAddr:
<mask> return addr.IP.String()
<mask> }
<mask> return ""
<mask> }
<mask>
<mask> func stringArrayDup(a []string) []string {
<mask> a2 := make([]string, len(a))
<mask> copy(a2, a)
<mask> return a2
<mask> }
<mask>
<mask> // Get IP address from net.Addr object
<mask> // Note: we can't use net.SplitHostPort(a.String()) because of IPv6 zone:
<mask> // https://github.com/AdguardTeam/AdGuardHome/internal/issues/1261
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove // Get IP address from net.Addr object
</s> add // IPStringFromAddr extracts IP address from net.Addr. </s> remove func ipFromAddr(a net.Addr) string {
switch addr := a.(type) {
case *net.UDPAddr:
return addr.IP.String()
case *net.TCPAddr:
return addr.IP.String()
</s> add func IPStringFromAddr(addr net.Addr) (ipstr string) {
if ip := ipFromAddr(addr); ip != nil {
return ip.String() </s> remove // Get IP address from net.Addr
func getIP(addr net.Addr) net.IP {
switch addr := addr.(type) {
case *net.UDPAddr:
return addr.IP
case *net.TCPAddr:
return addr.IP
}
return nil
</s> add func stringArrayDup(a []string) []string {
a2 := make([]string, len(a))
copy(a2, a)
return a2 </s> remove return addr.IP.String()
</s> add return addr.IP </s> remove return addr.IP.String()
</s> add return addr.IP | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/util.go |
// IPStringFromAddr extracts IP address from net.Addr. | <mask> copy(a2, a)
<mask> return a2
<mask> }
<mask>
<mask> // Get IP address from net.Addr object
<mask> // Note: we can't use net.SplitHostPort(a.String()) because of IPv6 zone:
<mask> // https://github.com/AdguardTeam/AdGuardHome/internal/issues/1261
<mask> func ipFromAddr(a net.Addr) string {
<mask> switch addr := a.(type) {
<mask> case *net.UDPAddr:
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove func ipFromAddr(a net.Addr) string {
switch addr := a.(type) {
case *net.UDPAddr:
return addr.IP.String()
case *net.TCPAddr:
return addr.IP.String()
</s> add func IPStringFromAddr(addr net.Addr) (ipstr string) {
if ip := ipFromAddr(addr); ip != nil {
return ip.String() </s> remove return ""
}
func stringArrayDup(a []string) []string {
a2 := make([]string, len(a))
copy(a2, a)
return a2
</s> add return nil </s> remove // Get IP address from net.Addr
func getIP(addr net.Addr) net.IP {
switch addr := addr.(type) {
case *net.UDPAddr:
return addr.IP
case *net.TCPAddr:
return addr.IP
}
return nil
</s> add func stringArrayDup(a []string) []string {
a2 := make([]string, len(a))
copy(a2, a)
return a2 </s> remove // GetIPString is a helper function that extracts IP address from net.Addr
func GetIPString(addr net.Addr) string {
</s> add // ipFromAddr gets IP address from addr.
func ipFromAddr(addr net.Addr) (ip net.IP) { </s> remove return addr.IP.String()
</s> add return addr.IP | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/util.go |
func IPStringFromAddr(addr net.Addr) (ipstr string) {
if ip := ipFromAddr(addr); ip != nil {
return ip.String() | <mask>
<mask> // Get IP address from net.Addr object
<mask> // Note: we can't use net.SplitHostPort(a.String()) because of IPv6 zone:
<mask> // https://github.com/AdguardTeam/AdGuardHome/internal/issues/1261
<mask> func ipFromAddr(a net.Addr) string {
<mask> switch addr := a.(type) {
<mask> case *net.UDPAddr:
<mask> return addr.IP.String()
<mask> case *net.TCPAddr:
<mask> return addr.IP.String()
<mask> }
<mask> return ""
<mask> }
<mask>
<mask> // Get IP address from net.Addr
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove // Get IP address from net.Addr object
</s> add // IPStringFromAddr extracts IP address from net.Addr. </s> remove return ""
}
func stringArrayDup(a []string) []string {
a2 := make([]string, len(a))
copy(a2, a)
return a2
</s> add return nil </s> remove return addr.IP.String()
</s> add return addr.IP </s> remove // GetIPString is a helper function that extracts IP address from net.Addr
func GetIPString(addr net.Addr) string {
</s> add // ipFromAddr gets IP address from addr.
func ipFromAddr(addr net.Addr) (ip net.IP) { </s> remove // Get IP address from net.Addr
func getIP(addr net.Addr) net.IP {
switch addr := addr.(type) {
case *net.UDPAddr:
return addr.IP
case *net.TCPAddr:
return addr.IP
}
return nil
</s> add func stringArrayDup(a []string) []string {
a2 := make([]string, len(a))
copy(a2, a)
return a2 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/util.go |
func stringArrayDup(a []string) []string {
a2 := make([]string, len(a))
copy(a2, a)
return a2 | <mask> }
<mask> return ""
<mask> }
<mask>
<mask> // Get IP address from net.Addr
<mask> func getIP(addr net.Addr) net.IP {
<mask> switch addr := addr.(type) {
<mask> case *net.UDPAddr:
<mask> return addr.IP
<mask> case *net.TCPAddr:
<mask> return addr.IP
<mask> }
<mask> return nil
<mask> }
<mask>
<mask> // Find value in a sorted array
<mask> func findSorted(ar []string, val string) int {
<mask> i := sort.SearchStrings(ar, val)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove return addr.IP.String()
</s> add return addr.IP </s> remove return addr.IP.String()
</s> add return addr.IP </s> remove func ipFromAddr(a net.Addr) string {
switch addr := a.(type) {
case *net.UDPAddr:
return addr.IP.String()
case *net.TCPAddr:
return addr.IP.String()
</s> add func IPStringFromAddr(addr net.Addr) (ipstr string) {
if ip := ipFromAddr(addr); ip != nil {
return ip.String() </s> remove // GetIPString is a helper function that extracts IP address from net.Addr
func GetIPString(addr net.Addr) string {
</s> add // ipFromAddr gets IP address from addr.
func ipFromAddr(addr net.Addr) (ip net.IP) { </s> remove // Get IP address from net.Addr object
</s> add // IPStringFromAddr extracts IP address from net.Addr. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/util.go |
assert.NotEmpty(t, u.Name) | <mask> a.storeSession(sess, &s)
<mask> a.Close()
<mask>
<mask> u := a.UserFind("name", "password")
<mask> assert.True(t, len(u.Name) != 0)
<mask>
<mask> time.Sleep(3 * time.Second)
<mask>
<mask> // load and remove expired sessions
<mask> a = InitAuth(fn, users, 60)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove a := ipFromAddr(&addr)
assert.True(t, a == "1:2:3::4")
</s> add assert.Equal(t, IPStringFromAddr(&addr), net.ParseIP("1:2:3::4").String()) </s> remove a = ipFromAddr(nil)
assert.True(t, a == "")
</s> add assert.Empty(t, IPStringFromAddr(nil)) </s> remove assert.True(t, s.RemoveStaticLease(l) != nil)
</s> add assert.NotNil(t, s.RemoveStaticLease(l)) </s> remove assert.True(t, s.RemoveStaticLease(l) != nil)
</s> add assert.NotNil(t, s.RemoveStaticLease(l)) </s> remove l.IP = net.ParseIP("192.168.10.110").To4()
</s> add l.IP = net.IP{192, 168, 10, 110} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/home/auth_test.go |
assert.Equal(t, http.StatusFound, w.statusCode)
assert.NotEmpty(t, w.hdr.Get("Location"))
assert.False(t, handlerCalled) | <mask> // get / - we're redirected to login page
<mask> r.URL = &url.URL{Path: "/"}
<mask> handlerCalled = false
<mask> handler2(&w, &r)
<mask> assert.True(t, w.statusCode == http.StatusFound)
<mask> assert.True(t, w.hdr.Get("Location") != "")
<mask> assert.True(t, !handlerCalled)
<mask>
<mask> // go to login page
<mask> loginURL := w.hdr.Get("Location")
<mask> r.URL = &url.URL{Path: loginURL}
<mask> handlerCalled = false
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, w.hdr.Get("Location") != "")
assert.True(t, !handlerCalled)
</s> add assert.NotEmpty(t, w.hdr.Get("Location"))
assert.False(t, handlerCalled) </s> remove assert.True(t, cookie != "")
</s> add assert.NotEmpty(t, cookie) </s> remove assert.True(t, s.RemoveStaticLease(l) != nil)
</s> add assert.NotNil(t, s.RemoveStaticLease(l)) </s> remove assert.True(t, s.RemoveStaticLease(l) != nil)
</s> add assert.NotNil(t, s.RemoveStaticLease(l)) </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/home/auth_test.go |
assert.NotEmpty(t, cookie) | <mask>
<mask> // perform login
<mask> cookie, err := Context.auth.httpCookie(loginJSON{Name: "name", Password: "password"})
<mask> assert.Nil(t, err)
<mask> assert.True(t, cookie != "")
<mask>
<mask> // get /
<mask> handler2 = optionalAuth(handler)
<mask> w.hdr = make(http.Header)
<mask> r.Header.Set("Cookie", cookie)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, w.hdr.Get("Location") != "")
assert.True(t, !handlerCalled)
</s> add assert.NotEmpty(t, w.hdr.Get("Location"))
assert.False(t, handlerCalled) </s> remove assert.True(t, w.statusCode == http.StatusFound)
assert.True(t, w.hdr.Get("Location") != "")
assert.True(t, !handlerCalled)
</s> add assert.Equal(t, http.StatusFound, w.statusCode)
assert.NotEmpty(t, w.hdr.Get("Location"))
assert.False(t, handlerCalled) </s> remove a := ipFromAddr(&addr)
assert.True(t, a == "1:2:3::4")
</s> add assert.Equal(t, IPStringFromAddr(&addr), net.ParseIP("1:2:3::4").String()) </s> remove assert.True(t, err == nil, "%s", err)
</s> add assert.Nil(t, err) </s> remove conf.BlockingIPv4 = "0.0.0.1"
conf.BlockingIPv6 = "::1"
</s> add conf.BlockingIPv4 = net.IP{0, 0, 0, 1}
conf.BlockingIPv6 = net.ParseIP("::1") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/home/auth_test.go |
assert.NotEmpty(t, w.hdr.Get("Location"))
assert.False(t, handlerCalled) | <mask> r.Header.Set("Cookie", cookie)
<mask> r.URL = &url.URL{Path: loginURL}
<mask> handlerCalled = false
<mask> handler2(&w, &r)
<mask> assert.True(t, w.hdr.Get("Location") != "")
<mask> assert.True(t, !handlerCalled)
<mask> r.Header.Del("Cookie")
<mask>
<mask> // get login page with an invalid cookie
<mask> handler2 = optionalAuth(handler)
<mask> w.hdr = make(http.Header)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, w.statusCode == http.StatusFound)
assert.True(t, w.hdr.Get("Location") != "")
assert.True(t, !handlerCalled)
</s> add assert.Equal(t, http.StatusFound, w.statusCode)
assert.NotEmpty(t, w.hdr.Get("Location"))
assert.False(t, handlerCalled) </s> remove assert.True(t, cookie != "")
</s> add assert.NotEmpty(t, cookie) </s> remove assert.True(t, err != nil) // invalid BlockingIPv4
</s> add assert.NotNil(t, err) // invalid BlockingIPv4 </s> remove conf.BlockingIPv4 = "bad IP"
</s> add conf.BlockingIPv4 = nil </s> remove a := ipFromAddr(&addr)
assert.True(t, a == "1:2:3::4")
</s> add assert.Equal(t, IPStringFromAddr(&addr), net.ParseIP("1:2:3::4").String()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/home/auth_test.go |
assert.True(t, b)
assert.Equal(t, c.Name, "client1") | <mask> assert.True(t, b)
<mask> assert.Nil(t, err)
<mask>
<mask> c, b = clients.Find("1.1.1.1")
<mask> assert.True(t, b && c.Name == "client1")
<mask>
<mask> c, b = clients.Find("1:2:3::4")
<mask> assert.True(t, b && c.Name == "client1")
<mask>
<mask> c, b = clients.Find("2.2.2.2")
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, b && c.Name == "client1")
</s> add assert.True(t, b)
assert.Equal(t, c.Name, "client1") </s> remove assert.True(t, b && c.Name == "client2")
</s> add assert.True(t, b)
assert.Equal(t, c.Name, "client2") </s> remove assert.True(t, !clients.Exists("1.2.3.4", ClientSourceHostsFile))
</s> add assert.False(t, clients.Exists("1.2.3.4", ClientSourceHostsFile)) </s> remove assert.True(t, c.Name == "client1-renamed")
assert.True(t, c.IDs[0] == "1.1.1.2")
</s> add assert.Equal(t, "client1-renamed", c.Name)
assert.Equal(t, "1.1.1.2", c.IDs[0]) </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/home/clients_test.go |
assert.True(t, b)
assert.Equal(t, c.Name, "client1") | <mask> c, b = clients.Find("1.1.1.1")
<mask> assert.True(t, b && c.Name == "client1")
<mask>
<mask> c, b = clients.Find("1:2:3::4")
<mask> assert.True(t, b && c.Name == "client1")
<mask>
<mask> c, b = clients.Find("2.2.2.2")
<mask> assert.True(t, b && c.Name == "client2")
<mask>
<mask> assert.True(t, !clients.Exists("1.2.3.4", ClientSourceHostsFile))
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, b && c.Name == "client1")
</s> add assert.True(t, b)
assert.Equal(t, c.Name, "client1") </s> remove assert.True(t, b && c.Name == "client2")
</s> add assert.True(t, b)
assert.Equal(t, c.Name, "client2") </s> remove assert.True(t, !clients.Exists("1.2.3.4", ClientSourceHostsFile))
</s> add assert.False(t, clients.Exists("1.2.3.4", ClientSourceHostsFile)) </s> remove assert.True(t, c.Name == "client1-renamed")
assert.True(t, c.IDs[0] == "1.1.1.2")
</s> add assert.Equal(t, "client1-renamed", c.Name)
assert.Equal(t, "1.1.1.2", c.IDs[0]) </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/home/clients_test.go |
assert.True(t, b)
assert.Equal(t, c.Name, "client2") | <mask> c, b = clients.Find("1:2:3::4")
<mask> assert.True(t, b && c.Name == "client1")
<mask>
<mask> c, b = clients.Find("2.2.2.2")
<mask> assert.True(t, b && c.Name == "client2")
<mask>
<mask> assert.True(t, !clients.Exists("1.2.3.4", ClientSourceHostsFile))
<mask> assert.True(t, clients.Exists("1.1.1.1", ClientSourceHostsFile))
<mask> assert.True(t, clients.Exists("2.2.2.2", ClientSourceHostsFile))
<mask> })
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, b && c.Name == "client1")
</s> add assert.True(t, b)
assert.Equal(t, c.Name, "client1") </s> remove assert.True(t, !clients.Exists("1.2.3.4", ClientSourceHostsFile))
</s> add assert.False(t, clients.Exists("1.2.3.4", ClientSourceHostsFile)) </s> remove assert.True(t, b && c.Name == "client1")
</s> add assert.True(t, b)
assert.Equal(t, c.Name, "client1") </s> remove assert.True(t, c.Name == "client1-renamed")
assert.True(t, c.IDs[0] == "1.1.1.2")
</s> add assert.Equal(t, "client1-renamed", c.Name)
assert.Equal(t, "1.1.1.2", c.IDs[0]) </s> remove assert.True(t, !clients.Exists("1.1.1.1", ClientSourceHostsFile))
</s> add assert.False(t, clients.Exists("1.1.1.1", ClientSourceHostsFile)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/home/clients_test.go |
assert.False(t, clients.Exists("1.2.3.4", ClientSourceHostsFile)) | <mask>
<mask> c, b = clients.Find("2.2.2.2")
<mask> assert.True(t, b && c.Name == "client2")
<mask>
<mask> assert.True(t, !clients.Exists("1.2.3.4", ClientSourceHostsFile))
<mask> assert.True(t, clients.Exists("1.1.1.1", ClientSourceHostsFile))
<mask> assert.True(t, clients.Exists("2.2.2.2", ClientSourceHostsFile))
<mask> })
<mask>
<mask> t.Run("add_fail_name", func(t *testing.T) {
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, b && c.Name == "client2")
</s> add assert.True(t, b)
assert.Equal(t, c.Name, "client2") </s> remove assert.True(t, b && c.Name == "client1")
</s> add assert.True(t, b)
assert.Equal(t, c.Name, "client1") </s> remove assert.True(t, b && c.Name == "client1")
</s> add assert.True(t, b)
assert.Equal(t, c.Name, "client1") </s> remove assert.True(t, !clients.Exists("1.1.1.1", ClientSourceHostsFile))
</s> add assert.False(t, clients.Exists("1.1.1.1", ClientSourceHostsFile)) </s> remove assert.True(t, c.Name == "client1-renamed")
assert.True(t, c.IDs[0] == "1.1.1.2")
</s> add assert.Equal(t, "client1-renamed", c.Name)
assert.Equal(t, "1.1.1.2", c.IDs[0]) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/home/clients_test.go |
assert.False(t, clients.Exists("1.1.1.1", ClientSourceHostsFile)) | <mask>
<mask> err := clients.Update("client1", c)
<mask> assert.Nil(t, err)
<mask>
<mask> assert.True(t, !clients.Exists("1.1.1.1", ClientSourceHostsFile))
<mask> assert.True(t, clients.Exists("1.1.1.2", ClientSourceHostsFile))
<mask>
<mask> c = Client{
<mask> IDs: []string{"1.1.1.2"},
<mask> Name: "client1-renamed",
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, clients.ipHost["1.1.1.1"].WhoisInfo[0][1] == "orgname-val")
</s> add assert.Equal(t, "orgname-val", clients.ipHost["1.1.1.1"].WhoisInfo[0][1]) </s> remove assert.True(t, !clients.Exists("1.2.3.4", ClientSourceHostsFile))
</s> add assert.False(t, clients.Exists("1.2.3.4", ClientSourceHostsFile)) </s> remove assert.True(t, b && c.Name == "client2")
</s> add assert.True(t, b)
assert.Equal(t, c.Name, "client2") </s> remove assert.True(t, clients.ipHost["1.1.1.2"] == nil)
</s> add assert.Nil(t, clients.ipHost["1.1.1.2"]) </s> remove assert.True(t, b && c.Name == "client1")
</s> add assert.True(t, b)
assert.Equal(t, c.Name, "client1") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/home/clients_test.go |
assert.Equal(t, "client1-renamed", c.Name)
assert.Equal(t, "1.1.1.2", c.IDs[0]) | <mask> assert.Nil(t, err)
<mask>
<mask> c, b := clients.Find("1.1.1.2")
<mask> assert.True(t, b)
<mask> assert.True(t, c.Name == "client1-renamed")
<mask> assert.True(t, c.IDs[0] == "1.1.1.2")
<mask> assert.True(t, c.UseOwnSettings)
<mask> assert.Nil(t, clients.list["client1"])
<mask> })
<mask>
<mask> t.Run("del_success", func(t *testing.T) {
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, b && c.Name == "client1")
</s> add assert.True(t, b)
assert.Equal(t, c.Name, "client1") </s> remove assert.True(t, b && c.Name == "client2")
</s> add assert.True(t, b)
assert.Equal(t, c.Name, "client2") </s> remove assert.True(t, !clients.Exists("1.2.3.4", ClientSourceHostsFile))
</s> add assert.False(t, clients.Exists("1.2.3.4", ClientSourceHostsFile)) </s> remove assert.True(t, b && c.Name == "client1")
</s> add assert.True(t, b)
assert.Equal(t, c.Name, "client1") </s> remove assert.True(t, err == nil, "%s", err)
</s> add assert.Nil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/home/clients_test.go |
assert.Equal(t, "orgname-val", clients.ipHost["1.1.1.255"].WhoisInfo[0][1]) | <mask>
<mask> whois := [][]string{{"orgname", "orgname-val"}, {"country", "country-val"}}
<mask> // set whois info on new client
<mask> clients.SetWhoisInfo("1.1.1.255", whois)
<mask> assert.True(t, clients.ipHost["1.1.1.255"].WhoisInfo[0][1] == "orgname-val")
<mask>
<mask> // set whois info on existing auto-client
<mask> _, _ = clients.AddHost("1.1.1.1", "host", ClientSourceRDNS)
<mask> clients.SetWhoisInfo("1.1.1.1", whois)
<mask> assert.True(t, clients.ipHost["1.1.1.1"].WhoisInfo[0][1] == "orgname-val")
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, clients.ipHost["1.1.1.1"].WhoisInfo[0][1] == "orgname-val")
</s> add assert.Equal(t, "orgname-val", clients.ipHost["1.1.1.1"].WhoisInfo[0][1]) </s> remove assert.True(t, clients.ipHost["1.1.1.2"] == nil)
</s> add assert.Nil(t, clients.ipHost["1.1.1.2"]) </s> remove assert.Equal(t, 3, len(hashes))
</s> add assert.Len(t, hashes, 3) </s> remove clientIP := ipFromAddr(d.Addr)
</s> add clientIP := IPStringFromAddr(d.Addr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/home/clients_test.go |
assert.Equal(t, "orgname-val", clients.ipHost["1.1.1.1"].WhoisInfo[0][1]) | <mask>
<mask> // set whois info on existing auto-client
<mask> _, _ = clients.AddHost("1.1.1.1", "host", ClientSourceRDNS)
<mask> clients.SetWhoisInfo("1.1.1.1", whois)
<mask> assert.True(t, clients.ipHost["1.1.1.1"].WhoisInfo[0][1] == "orgname-val")
<mask>
<mask> // Check that we cannot set whois info on a manually-added client
<mask> c = Client{
<mask> IDs: []string{"1.1.1.2"},
<mask> Name: "client1",
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, clients.ipHost["1.1.1.255"].WhoisInfo[0][1] == "orgname-val")
</s> add assert.Equal(t, "orgname-val", clients.ipHost["1.1.1.255"].WhoisInfo[0][1]) </s> remove assert.True(t, !clients.Exists("1.1.1.1", ClientSourceHostsFile))
</s> add assert.False(t, clients.Exists("1.1.1.1", ClientSourceHostsFile)) </s> remove assert.True(t, clients.ipHost["1.1.1.2"] == nil)
</s> add assert.Nil(t, clients.ipHost["1.1.1.2"]) </s> remove a := ipFromAddr(&addr)
assert.True(t, a == "1:2:3::4")
</s> add assert.Equal(t, IPStringFromAddr(&addr), net.ParseIP("1:2:3::4").String()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/home/clients_test.go |
assert.Nil(t, clients.ipHost["1.1.1.2"]) | <mask> Name: "client1",
<mask> }
<mask> _, _ = clients.Add(c)
<mask> clients.SetWhoisInfo("1.1.1.2", whois)
<mask> assert.True(t, clients.ipHost["1.1.1.2"] == nil)
<mask> _ = clients.Del("client1")
<mask> }
<mask>
<mask> func TestClientsAddExisting(t *testing.T) {
<mask> var c Client
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, clients.ipHost["1.1.1.1"].WhoisInfo[0][1] == "orgname-val")
</s> add assert.Equal(t, "orgname-val", clients.ipHost["1.1.1.1"].WhoisInfo[0][1]) </s> remove assert.True(t, reply.Answer[0].(*dns.A).A.Equal(net.ParseIP("0.0.0.0")))
</s> add assert.True(t, reply.Answer[0].(*dns.A).A.Equal(net.IP{0, 0, 0, 0})) </s> remove assert.True(t, !clients.Exists("1.1.1.1", ClientSourceHostsFile))
</s> add assert.False(t, clients.Exists("1.1.1.1", ClientSourceHostsFile)) </s> remove assert.True(t, clients.ipHost["1.1.1.255"].WhoisInfo[0][1] == "orgname-val")
</s> add assert.Equal(t, "orgname-val", clients.ipHost["1.1.1.255"].WhoisInfo[0][1]) </s> remove assert.Equal(t, 3, len(hashes))
</s> add assert.Len(t, hashes, 3) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/home/clients_test.go |
assert.Len(t, config.Upstreams, 1)
assert.Len(t, config.DomainReservedUpstreams, 1) | <mask> assert.Nil(t, config)
<mask>
<mask> config = clients.FindUpstreams("1.1.1.1")
<mask> assert.NotNil(t, config)
<mask> assert.Equal(t, 1, len(config.Upstreams))
<mask> assert.Equal(t, 1, len(config.DomainReservedUpstreams))
<mask> }
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 1, len(msg.Answer))
</s> add assert.Len(t, msg.Answer, 1) </s> remove assert.Equal(t, 1, len(ips))
</s> add assert.Len(t, ips, 1) </s> remove assert.Equal(t, 1, len(ips))
</s> add assert.Len(t, ips, 1) </s> remove assert.True(t, s.AddStaticLease(l) != nil)
</s> add assert.NotNil(t, s.AddStaticLease(l)) </s> remove assert.True(t, s.AddStaticLease(l) != nil)
</s> add assert.NotNil(t, s.AddStaticLease(l)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/home/clients_test.go |
ip := dnsforward.IPStringFromAddr(d.Addr) | <mask> return Context.dnsServer != nil && Context.dnsServer.IsRunning()
<mask> }
<mask>
<mask> func onDNSRequest(d *proxy.DNSContext) {
<mask> ip := dnsforward.GetIPString(d.Addr)
<mask> if ip == "" {
<mask> // This would be quite weird if we get here
<mask> return
<mask> }
<mask>
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove ip := net.ParseIP(fields[2])
if ip == nil {
return ""
}
return fields[2]
</s> add return net.ParseIP(fields[2]) </s> remove ip := net.ParseIP(lj.IP)
if ip != nil && ip.To4() == nil {
mac, err := net.ParseMAC(lj.HWAddr)
</s> add if lj.IP == nil {
httpError(r, w, http.StatusBadRequest, "invalid IP")
return
}
ip4 := lj.IP.To4()
mac, err := net.ParseMAC(lj.HWAddr)
lease := Lease{
HWAddr: mac,
}
if ip4 == nil {
lease.IP = lj.IP.To16()
</s> remove ip := net.ParseIP(lj.IP)
if ip != nil && ip.To4() == nil {
mac, err := net.ParseMAC(lj.HWAddr)
</s> add if lj.IP == nil {
httpError(r, w, http.StatusBadRequest, "invalid IP")
return
}
ip4 := lj.IP.To4()
mac, err := net.ParseMAC(lj.HWAddr)
lease := Lease{
HWAddr: mac,
}
if ip4 == nil {
lease.IP = lj.IP.To16()
</s> remove return
}
</s> add </s> remove return
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/home/dns.go |
assert.Nil(t, err) | <mask> }
<mask>
<mask> // download
<mask> ok, err := Context.filters.update(&f)
<mask> assert.Equal(t, nil, err)
<mask> assert.True(t, ok)
<mask> assert.Equal(t, 3, f.RulesCount)
<mask>
<mask> // refresh
<mask> ok, err = Context.filters.update(&f)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, !ok && err == nil)
</s> add assert.False(t, ok)
assert.Nil(t, err) </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove assert.Equal(t, 3, len(hashes))
</s> add assert.Len(t, hashes, 3) </s> remove assert.True(t, err == nil, "%s", err)
</s> add assert.Nil(t, err) </s> remove assert.True(t, err == nil, "%s", err)
assert.True(t, resp.StatusCode == http.StatusOK)
</s> add assert.Nil(t, err)
assert.Equal(t, http.StatusOK, resp.StatusCode) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/home/filter_test.go |
assert.False(t, ok)
assert.Nil(t, err) | <mask> assert.Equal(t, 3, f.RulesCount)
<mask>
<mask> // refresh
<mask> ok, err = Context.filters.update(&f)
<mask> assert.True(t, !ok && err == nil)
<mask>
<mask> err = Context.filters.load(&f)
<mask> assert.True(t, err == nil)
<mask>
<mask> f.unload()
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove assert.Equal(t, nil, err)
</s> add assert.Nil(t, err) </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove assert.True(t, res.Rules[0].Text == "||host2^")
</s> add assert.Equal(t, "||host2^", res.Rules[0].Text) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/home/filter_test.go |
assert.Nil(t, err) | <mask> ok, err = Context.filters.update(&f)
<mask> assert.True(t, !ok && err == nil)
<mask>
<mask> err = Context.filters.load(&f)
<mask> assert.True(t, err == nil)
<mask>
<mask> f.unload()
<mask> _ = os.Remove(f.Path())
<mask> }
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, !ok && err == nil)
</s> add assert.False(t, ok)
assert.Nil(t, err) </s> remove assert.Equal(t, nil, err)
</s> add assert.Nil(t, err) </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove assert.True(t, err == nil)
s.conf.dnsIPAddrs = []net.IP{net.ParseIP("192.168.10.1").To4()}
</s> add assert.Nil(t, err)
s.conf.dnsIPAddrs = []net.IP{{192, 168, 10, 1}} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/home/filter_test.go |
assert.Nil(t, ioutil.WriteFile(fn, []byte(yamlConf), 0o644)) | <mask> defer func() { _ = os.RemoveAll(dir) }()
<mask> fn := filepath.Join(dir, "AdGuardHome.yaml")
<mask>
<mask> // Prepare the test config
<mask> assert.True(t, ioutil.WriteFile(fn, []byte(yamlConf), 0o644) == nil)
<mask> fn, _ = filepath.Abs(fn)
<mask>
<mask> config = configuration{} // the global variable is dirty because of the previous tests run
<mask> args := options{}
<mask> args.configFilename = fn
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) </s> remove l.IP = net.ParseIP("192.168.10.150").To4()
</s> add l.IP = net.IP{192, 168, 10, 150} </s> remove l.IP = net.ParseIP("192.168.10.152").To4()
</s> add l.IP = net.IP{192, 168, 10, 152} </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/home/home_test.go |
assert.Nilf(t, err, "%s", err) | <mask> break
<mask> }
<mask> time.Sleep(100 * time.Millisecond)
<mask> }
<mask> assert.Truef(t, err == nil, "%s", err)
<mask> assert.Equal(t, http.StatusOK, resp.StatusCode)
<mask>
<mask> resp, err = h.Get("http://127.0.0.1:3000/control/status")
<mask> assert.Truef(t, err == nil, "%s", err)
<mask> assert.Equal(t, http.StatusOK, resp.StatusCode)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Truef(t, err == nil, "%s", err)
</s> add assert.Nilf(t, err, "%s", err) </s> remove assert.True(t, err == nil, "%s", err)
assert.True(t, resp.StatusCode == http.StatusOK)
</s> add assert.Nil(t, err)
assert.Equal(t, http.StatusOK, resp.StatusCode) </s> remove assert.True(t, err == nil, "%s", err)
</s> add assert.Nil(t, err) </s> remove assert.True(t, err == nil, "%s", err)
</s> add assert.Nil(t, err) </s> remove assert.True(t, err == nil, "%s", err)
</s> add assert.Nil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/home/home_test.go |
assert.Nilf(t, err, "%s", err) | <mask> assert.Truef(t, err == nil, "%s", err)
<mask> assert.Equal(t, http.StatusOK, resp.StatusCode)
<mask>
<mask> resp, err = h.Get("http://127.0.0.1:3000/control/status")
<mask> assert.Truef(t, err == nil, "%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)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Truef(t, err == nil, "%s", err)
</s> add assert.Nilf(t, err, "%s", err) </s> remove assert.True(t, err == nil, "%s", err)
assert.True(t, resp.StatusCode == http.StatusOK)
</s> add assert.Nil(t, err)
assert.Equal(t, http.StatusOK, resp.StatusCode) </s> remove assert.True(t, err == nil, "%s", err)
</s> add assert.Nil(t, err) </s> remove assert.True(t, err == nil, "%s", err)
</s> add assert.Nil(t, err) </s> remove assert.True(t, err == nil, "%s", err)
</s> add assert.Nil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/home/home_test.go |
assert.Nil(t, err) | <mask> req.Id = dns.Id()
<mask> req.RecursionDesired = true
<mask> req.Question = []dns.Question{{Name: "static.adguard.com.", Qtype: dns.TypeA, Qclass: dns.ClassINET}}
<mask> buf, err := req.Pack()
<mask> assert.True(t, err == nil, "%s", err)
<mask> requestURL := "http://127.0.0.1:3000/dns-query?dns=" + base64.RawURLEncoding.EncodeToString(buf)
<mask> resp, err = http.DefaultClient.Get(requestURL)
<mask> assert.True(t, err == nil, "%s", err)
<mask> body, err := ioutil.ReadAll(resp.Body)
<mask> assert.True(t, err == nil, "%s", err)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, err == nil, "%s", err)
</s> add assert.Nil(t, err) </s> remove assert.True(t, err == nil, "%s", err)
assert.True(t, resp.StatusCode == http.StatusOK)
</s> add assert.Nil(t, err)
assert.Equal(t, http.StatusOK, resp.StatusCode) </s> remove assert.True(t, err == nil, "%s", err)
</s> add assert.Nil(t, err) </s> remove assert.Truef(t, err == nil, "%s", err)
</s> add assert.Nilf(t, err, "%s", err) </s> remove assert.Truef(t, err == nil, "%s", err)
</s> add assert.Nilf(t, err, "%s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/home/home_test.go |
assert.Nil(t, err) | <mask> buf, err := req.Pack()
<mask> assert.True(t, err == nil, "%s", err)
<mask> requestURL := "http://127.0.0.1:3000/dns-query?dns=" + base64.RawURLEncoding.EncodeToString(buf)
<mask> resp, err = http.DefaultClient.Get(requestURL)
<mask> assert.True(t, err == nil, "%s", err)
<mask> body, err := ioutil.ReadAll(resp.Body)
<mask> assert.True(t, err == nil, "%s", err)
<mask> assert.True(t, resp.StatusCode == http.StatusOK)
<mask> response := dns.Msg{}
<mask> err = response.Unpack(body)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, err == nil, "%s", err)
assert.True(t, resp.StatusCode == http.StatusOK)
</s> add assert.Nil(t, err)
assert.Equal(t, http.StatusOK, resp.StatusCode) </s> remove assert.True(t, err == nil, "%s", err)
</s> add assert.Nil(t, err) </s> remove assert.True(t, err == nil, "%s", err)
</s> add assert.Nil(t, err) </s> remove assert.True(t, err == nil, "%s", err)
</s> add assert.Nil(t, err) </s> remove assert.Truef(t, err == nil, "%s", err)
</s> add assert.Nilf(t, err, "%s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/home/home_test.go |
assert.Nil(t, err)
assert.Equal(t, http.StatusOK, resp.StatusCode) | <mask> requestURL := "http://127.0.0.1:3000/dns-query?dns=" + base64.RawURLEncoding.EncodeToString(buf)
<mask> resp, err = http.DefaultClient.Get(requestURL)
<mask> assert.True(t, err == nil, "%s", err)
<mask> body, err := ioutil.ReadAll(resp.Body)
<mask> assert.True(t, err == nil, "%s", err)
<mask> assert.True(t, resp.StatusCode == http.StatusOK)
<mask> response := dns.Msg{}
<mask> err = response.Unpack(body)
<mask> assert.True(t, err == nil, "%s", err)
<mask> addrs = nil
<mask> proxyutil.AppendIPAddrs(&addrs, response.Answer)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, err == nil, "%s", err)
</s> add assert.Nil(t, err) </s> remove assert.True(t, err == nil, "%s", err)
</s> add assert.Nil(t, err) </s> remove assert.True(t, err == nil, "%s", err)
</s> add assert.Nil(t, err) </s> remove assert.Truef(t, err == nil, "%s", err)
</s> add assert.Nilf(t, err, "%s", err) </s> remove assert.True(t, err == nil, "%s", err)
</s> add assert.Nil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/home/home_test.go |
assert.Nil(t, err) | <mask> assert.True(t, err == nil, "%s", err)
<mask> assert.True(t, resp.StatusCode == http.StatusOK)
<mask> response := dns.Msg{}
<mask> err = response.Unpack(body)
<mask> assert.True(t, err == nil, "%s", err)
<mask> addrs = nil
<mask> proxyutil.AppendIPAddrs(&addrs, response.Answer)
<mask> haveIP = len(addrs) != 0
<mask> assert.True(t, haveIP)
<mask>
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, err == nil, "%s", err)
assert.True(t, resp.StatusCode == http.StatusOK)
</s> add assert.Nil(t, err)
assert.Equal(t, http.StatusOK, resp.StatusCode) </s> remove assert.True(t, err == nil, "%s", err)
</s> add assert.Nil(t, err) </s> remove assert.True(t, err == nil, "%s", err)
</s> add assert.Nil(t, err) </s> remove assert.True(t, err == nil, "%s", err)
</s> add assert.Nil(t, err) </s> remove assert.Truef(t, err == nil, "%s", err)
</s> add assert.Nilf(t, err, "%s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/home/home_test.go |
if assert.Len(t, mc.PayloadContent, 1) { | <mask> var mc mobileConfig
<mask> _, err = plist.Unmarshal(w.Body.Bytes(), &mc)
<mask> assert.Nil(t, err)
<mask>
<mask> if assert.Equal(t, 1, len(mc.PayloadContent)) {
<mask> assert.Equal(t, "example.org DoH", mc.PayloadContent[0].Name)
<mask> assert.Equal(t, "example.org DoH", mc.PayloadContent[0].PayloadDisplayName)
<mask> assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
<mask> assert.Equal(t, "https://example.org/dns-query", mc.PayloadContent[0].DNSSettings.ServerURL)
<mask> }
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove if assert.Equal(t, 1, len(mc.PayloadContent)) {
</s> add if assert.Len(t, mc.PayloadContent, 1) { </s> remove if assert.Equal(t, 1, len(mc.PayloadContent)) {
</s> add if assert.Len(t, mc.PayloadContent, 1) { </s> remove if assert.Equal(t, 1, len(mc.PayloadContent)) {
</s> add if assert.Len(t, mc.PayloadContent, 1) { </s> remove assert.True(t, clients.ipHost["1.1.1.2"] == nil)
</s> add assert.Nil(t, clients.ipHost["1.1.1.2"]) </s> remove s.conf.routerIP, err = parseIPv4(s.conf.GatewayIP)
</s> add s.conf.routerIP, err = tryTo4(s.conf.GatewayIP) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/home/mobileconfig_test.go |
if assert.Len(t, mc.PayloadContent, 1) { | <mask> var mc mobileConfig
<mask> _, err = plist.Unmarshal(w.Body.Bytes(), &mc)
<mask> assert.Nil(t, err)
<mask>
<mask> if assert.Equal(t, 1, len(mc.PayloadContent)) {
<mask> assert.Equal(t, "example.org DoH", mc.PayloadContent[0].Name)
<mask> assert.Equal(t, "example.org DoH", mc.PayloadContent[0].PayloadDisplayName)
<mask> assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
<mask> assert.Equal(t, "https://example.org/dns-query", mc.PayloadContent[0].DNSSettings.ServerURL)
<mask> }
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/home/mobileconfig_test.go |
if assert.Len(t, mc.PayloadContent, 1) { | <mask> var mc mobileConfig
<mask> _, err = plist.Unmarshal(w.Body.Bytes(), &mc)
<mask> assert.Nil(t, err)
<mask>
<mask> if assert.Equal(t, 1, len(mc.PayloadContent)) {
<mask> assert.Equal(t, "example.org DoT", mc.PayloadContent[0].Name)
<mask> assert.Equal(t, "example.org DoT", mc.PayloadContent[0].PayloadDisplayName)
<mask> assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
<mask> }
<mask> })
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove if assert.Equal(t, 1, len(mc.PayloadContent)) {
</s> add if assert.Len(t, mc.PayloadContent, 1) { </s> remove if assert.Equal(t, 1, len(mc.PayloadContent)) {
</s> add if assert.Len(t, mc.PayloadContent, 1) { </s> remove if assert.Equal(t, 1, len(mc.PayloadContent)) {
</s> add if assert.Len(t, mc.PayloadContent, 1) { </s> remove assert.True(t, clients.ipHost["1.1.1.2"] == nil)
</s> add assert.Nil(t, clients.ipHost["1.1.1.2"]) </s> remove assert.Equal(t, 1, len(entries))
</s> add assert.Len(t, entries, 1) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/home/mobileconfig_test.go |
if assert.Len(t, mc.PayloadContent, 1) { | <mask> var mc mobileConfig
<mask> _, err = plist.Unmarshal(w.Body.Bytes(), &mc)
<mask> assert.Nil(t, err)
<mask>
<mask> if assert.Equal(t, 1, len(mc.PayloadContent)) {
<mask> assert.Equal(t, "example.org DoT", mc.PayloadContent[0].Name)
<mask> assert.Equal(t, "example.org DoT", mc.PayloadContent[0].PayloadDisplayName)
<mask> assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
<mask> }
<mask> })
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/home/mobileconfig_test.go |
assert.Nil(t, err) | <mask> dns := &dnsforward.Server{}
<mask> conf := &dnsforward.ServerConfig{}
<mask> conf.UpstreamDNS = []string{"8.8.8.8"}
<mask> err := dns.Prepare(conf)
<mask> assert.True(t, err == nil, "%s", err)
<mask>
<mask> clients := &clientsContainer{}
<mask> rdns := InitRDNS(dns, clients)
<mask> r := rdns.resolve("1.1.1.1")
<mask> assert.True(t, r == "one.one.one.one", "%s", r)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, r == "one.one.one.one", "%s", r)
</s> add assert.Equal(t, "one.one.one.one", r, r) </s> remove assert.True(t, err == nil, "%s", err)
</s> add assert.Nil(t, err) </s> remove assert.True(t, err == nil, "%s", err)
assert.True(t, resp.StatusCode == http.StatusOK)
</s> add assert.Nil(t, err)
assert.Equal(t, http.StatusOK, resp.StatusCode) </s> remove assert.True(t, err == nil, "%s", err)
</s> add assert.Nil(t, err) </s> remove assert.True(t, err == nil, "%s", err)
</s> add assert.Nil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/home/rdns_test.go |
assert.Equal(t, "one.one.one.one", r, r) | <mask>
<mask> clients := &clientsContainer{}
<mask> rdns := InitRDNS(dns, clients)
<mask> r := rdns.resolve("1.1.1.1")
<mask> assert.True(t, r == "one.one.one.one", "%s", r)
<mask> }
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, err == nil, "%s", err)
</s> add assert.Nil(t, err) </s> remove assert.True(t, err == nil, "%s", err)
</s> add assert.Nil(t, err) </s> remove assert.True(t, err == nil, "%s", err)
assert.True(t, resp.StatusCode == http.StatusOK)
</s> add assert.Nil(t, err)
assert.Equal(t, http.StatusOK, resp.StatusCode) </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/home/rdns_test.go |
assert.Empty(t, s) | <mask> got := &logEntry{}
<mask> decodeLogEntry(got, data)
<mask>
<mask> s := logOutput.String()
<mask> assert.Equal(t, "", s)
<mask>
<mask> // Correct for time zones.
<mask> got.Time = got.Time.UTC()
<mask> assert.Equal(t, want, got)
<mask> })
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, "", s)
</s> add assert.Empty(t, s) </s> remove s = updateStaticIPdhcpcdConf("wlan0", "192.168.0.2/24", "", "192.168.0.2")
</s> add s = updateStaticIPdhcpcdConf("wlan0", "192.168.0.2/24", nil, net.IP{192, 168, 0, 2}) </s> remove assert.Equal(t, "", res.CanonName)
assert.Len(t, res.Rules, 0)
</s> add assert.Empty(t, res.CanonName)
assert.Empty(t, res.Rules) </s> remove s := updateStaticIPdhcpcdConf("wlan0", "192.168.0.2/24", "192.168.0.1", "192.168.0.2")
</s> add s := updateStaticIPdhcpcdConf("wlan0", "192.168.0.2/24", net.IP{192, 168, 0, 1}, net.IP{192, 168, 0, 2}) </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/querylog/decode_test.go |
assert.Empty(t, s) | <mask> decodeLogEntry(l, tc.log)
<mask>
<mask> s := logOutput.String()
<mask> if tc.want == "" {
<mask> assert.Equal(t, "", s)
<mask> } else {
<mask> assert.True(t, strings.HasSuffix(s, tc.want),
<mask> "got %q", s)
<mask> }
<mask>
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, "", s)
</s> add assert.Empty(t, s) </s> remove s = updateStaticIPdhcpcdConf("wlan0", "192.168.0.2/24", "", "192.168.0.2")
</s> add s = updateStaticIPdhcpcdConf("wlan0", "192.168.0.2/24", nil, net.IP{192, 168, 0, 2}) </s> remove assert.True(t, SplitNext(&s, ',') == "a")
assert.True(t, SplitNext(&s, ',') == "b")
assert.True(t, SplitNext(&s, ',') == "c" && len(s) == 0)
</s> add assert.Equal(t, "a", SplitNext(&s, ','))
assert.Equal(t, "b", SplitNext(&s, ','))
assert.Equal(t, "c", SplitNext(&s, ','))
assert.Empty(t, s) </s> remove ip := net.ParseIP(fields[2])
if ip == nil {
return ""
}
return fields[2]
</s> add return net.ParseIP(fields[2]) </s> remove jsonIface.Addrs4 = append(jsonIface.Addrs4, ipnet.IP.String())
</s> add jsonIface.Addrs4 = append(jsonIface.Addrs4, ipnet.IP) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/querylog/decode_test.go |
assert.Len(t, entries, 4) | <mask>
<mask> // get all entries
<mask> params := newSearchParams()
<mask> entries, _ := l.search(params)
<mask> assert.Equal(t, 4, len(entries))
<mask> assertLogEntry(t, entries[0], "example.com", "1.1.1.4", "2.2.2.4")
<mask> assertLogEntry(t, entries[1], "test.example.org", "1.1.1.3", "2.2.2.3")
<mask> assertLogEntry(t, entries[2], "example.org", "1.1.1.2", "2.2.2.2")
<mask> assertLogEntry(t, entries[3], "example.org", "1.1.1.1", "2.2.2.1")
<mask>
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 4, len(entries))
</s> add assert.Len(t, entries, 4) </s> remove assert.Equal(t, 3, len(entries))
</s> add assert.Len(t, entries, 3) </s> remove assert.Equal(t, 1, len(entries))
</s> add assert.Len(t, entries, 1) </s> remove assert.Equal(t, 1, len(entries))
</s> add assert.Len(t, entries, 1) </s> remove assert.Equal(t, 5, len(entries))
</s> add assert.Len(t, entries, 5) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/querylog/qlog_test.go |
assert.Len(t, entries, 1) | <mask> strict: true,
<mask> value: "TEST.example.org",
<mask> })
<mask> entries, _ = l.search(params)
<mask> assert.Equal(t, 1, len(entries))
<mask> assertLogEntry(t, entries[0], "test.example.org", "1.1.1.3", "2.2.2.3")
<mask>
<mask> // search by domain (not strict)
<mask> params = newSearchParams()
<mask> params.searchCriteria = append(params.searchCriteria, searchCriteria{
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 1, len(entries))
</s> add assert.Len(t, entries, 1) </s> remove assert.Equal(t, 3, len(entries))
</s> add assert.Len(t, entries, 3) </s> remove assert.Equal(t, 4, len(entries))
</s> add assert.Len(t, entries, 4) </s> remove assert.Equal(t, 4, len(entries))
</s> add assert.Len(t, entries, 4) </s> remove assert.Equal(t, 5, len(entries))
</s> add assert.Len(t, entries, 5) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/querylog/qlog_test.go |
assert.Len(t, entries, 3) | <mask> strict: false,
<mask> value: "example.ORG",
<mask> })
<mask> entries, _ = l.search(params)
<mask> assert.Equal(t, 3, len(entries))
<mask> assertLogEntry(t, entries[0], "test.example.org", "1.1.1.3", "2.2.2.3")
<mask> assertLogEntry(t, entries[1], "example.org", "1.1.1.2", "2.2.2.2")
<mask> assertLogEntry(t, entries[2], "example.org", "1.1.1.1", "2.2.2.1")
<mask>
<mask> // search by client IP (strict)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 4, len(entries))
</s> add assert.Len(t, entries, 4) </s> remove assert.Equal(t, 4, len(entries))
</s> add assert.Len(t, entries, 4) </s> remove assert.Equal(t, 1, len(entries))
</s> add assert.Len(t, entries, 1) </s> remove assert.Equal(t, 1, len(entries))
</s> add assert.Len(t, entries, 1) </s> remove assert.Equal(t, 5, len(entries))
</s> add assert.Len(t, entries, 5) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/querylog/qlog_test.go |
assert.Len(t, entries, 1) | <mask> strict: true,
<mask> value: "2.2.2.2",
<mask> })
<mask> entries, _ = l.search(params)
<mask> assert.Equal(t, 1, len(entries))
<mask> assertLogEntry(t, entries[0], "example.org", "1.1.1.2", "2.2.2.2")
<mask>
<mask> // search by client IP (part of)
<mask> params = newSearchParams()
<mask> params.searchCriteria = append(params.searchCriteria, searchCriteria{
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 1, len(entries))
</s> add assert.Len(t, entries, 1) </s> remove assert.Equal(t, 3, len(entries))
</s> add assert.Len(t, entries, 3) </s> remove assert.Equal(t, 4, len(entries))
</s> add assert.Len(t, entries, 4) </s> remove assert.Equal(t, 4, len(entries))
</s> add assert.Len(t, entries, 4) </s> remove assert.Equal(t, 5, len(entries))
</s> add assert.Len(t, entries, 5) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/querylog/qlog_test.go |
assert.Len(t, entries, 4) | <mask> strict: false,
<mask> value: "2.2.2",
<mask> })
<mask> entries, _ = l.search(params)
<mask> assert.Equal(t, 4, len(entries))
<mask> assertLogEntry(t, entries[0], "example.com", "1.1.1.4", "2.2.2.4")
<mask> assertLogEntry(t, entries[1], "test.example.org", "1.1.1.3", "2.2.2.3")
<mask> assertLogEntry(t, entries[2], "example.org", "1.1.1.2", "2.2.2.2")
<mask> assertLogEntry(t, entries[3], "example.org", "1.1.1.1", "2.2.2.1")
<mask> }
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 4, len(entries))
</s> add assert.Len(t, entries, 4) </s> remove assert.Equal(t, 3, len(entries))
</s> add assert.Len(t, entries, 3) </s> remove assert.Equal(t, 1, len(entries))
</s> add assert.Len(t, entries, 1) </s> remove assert.Equal(t, 1, len(entries))
</s> add assert.Len(t, entries, 1) </s> remove assert.Equal(t, 5, len(entries))
</s> add assert.Len(t, entries, 5) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/querylog/qlog_test.go |
assert.Len(t, entries, 10) | <mask> params := newSearchParams()
<mask> params.offset = 0
<mask> params.limit = 10
<mask> entries, _ := l.search(params)
<mask> assert.Equal(t, 10, len(entries))
<mask> assert.Equal(t, entries[0].QHost, "first.example.org")
<mask> assert.Equal(t, entries[9].QHost, "first.example.org")
<mask>
<mask> // Second page
<mask> params.offset = 10
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 10, len(entries))
</s> add assert.Len(t, entries, 10) </s> remove assert.Equal(t, 5, len(entries))
</s> add assert.Len(t, entries, 5) </s> remove assert.Equal(t, 0, len(entries))
</s> add assert.Empty(t, entries) </s> remove assert.Equal(t, 5, len(entries))
</s> add assert.Len(t, entries, 5) </s> remove assert.Equal(t, 10, len(entries))
</s> add assert.Len(t, entries, 10) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/querylog/qlog_test.go |
assert.Len(t, entries, 10) | <mask> // Second page
<mask> params.offset = 10
<mask> params.limit = 10
<mask> entries, _ = l.search(params)
<mask> assert.Equal(t, 10, len(entries))
<mask> assert.Equal(t, entries[0].QHost, "second.example.org")
<mask> assert.Equal(t, entries[9].QHost, "second.example.org")
<mask>
<mask> // Second and a half page
<mask> params.offset = 15
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 5, len(entries))
</s> add assert.Len(t, entries, 5) </s> remove assert.Equal(t, 10, len(entries))
</s> add assert.Len(t, entries, 10) </s> remove assert.Equal(t, 0, len(entries))
</s> add assert.Empty(t, entries) </s> remove assert.Equal(t, 5, len(entries))
</s> add assert.Len(t, entries, 5) </s> remove assert.Equal(t, 10, len(entries))
</s> add assert.Len(t, entries, 10) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/querylog/qlog_test.go |
assert.Len(t, entries, 5) | <mask> // Second and a half page
<mask> params.offset = 15
<mask> params.limit = 10
<mask> entries, _ = l.search(params)
<mask> assert.Equal(t, 5, len(entries))
<mask> assert.Equal(t, entries[0].QHost, "second.example.org")
<mask> assert.Equal(t, entries[4].QHost, "second.example.org")
<mask>
<mask> // Third page
<mask> params.offset = 20
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 10, len(entries))
</s> add assert.Len(t, entries, 10) </s> remove assert.Equal(t, 10, len(entries))
</s> add assert.Len(t, entries, 10) </s> remove assert.Equal(t, 0, len(entries))
</s> add assert.Empty(t, entries) </s> remove assert.Equal(t, 5, len(entries))
</s> add assert.Len(t, entries, 5) </s> remove assert.Equal(t, 10, len(entries))
</s> add assert.Len(t, entries, 10) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/querylog/qlog_test.go |
assert.Empty(t, entries) | <mask> // Third page
<mask> params.offset = 20
<mask> params.limit = 10
<mask> entries, _ = l.search(params)
<mask> assert.Equal(t, 0, len(entries))
<mask> }
<mask>
<mask> func TestQueryLogMaxFileScanEntries(t *testing.T) {
<mask> conf := Config{
<mask> Enabled: true,
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 5, len(entries))
</s> add assert.Len(t, entries, 5) </s> remove assert.Equal(t, 10, len(entries))
</s> add assert.Len(t, entries, 10) </s> remove assert.Equal(t, 10, len(entries))
</s> add assert.Len(t, entries, 10) </s> remove assert.Equal(t, 10, len(entries))
</s> add assert.Len(t, entries, 10) </s> remove assert.Equal(t, 5, len(entries))
</s> add assert.Len(t, entries, 5) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/querylog/qlog_test.go |
assert.Len(t, entries, 5) | <mask>
<mask> params := newSearchParams()
<mask> params.maxFileScanEntries = 5 // do not scan more than 5 records
<mask> entries, _ := l.search(params)
<mask> assert.Equal(t, 5, len(entries))
<mask>
<mask> params.maxFileScanEntries = 0 // disable the limit
<mask> entries, _ = l.search(params)
<mask> assert.Equal(t, 10, len(entries))
<mask> }
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 10, len(entries))
</s> add assert.Len(t, entries, 10) </s> remove assert.Equal(t, 10, len(entries))
</s> add assert.Len(t, entries, 10) </s> remove assert.Equal(t, 1, len(entries))
</s> add assert.Len(t, entries, 1) </s> remove assert.Equal(t, 1, len(entries))
</s> add assert.Len(t, entries, 1) </s> remove assert.Equal(t, 5, len(entries))
</s> add assert.Len(t, entries, 5) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/querylog/qlog_test.go |
assert.Len(t, entries, 10) | <mask> assert.Equal(t, 5, len(entries))
<mask>
<mask> params.maxFileScanEntries = 0 // disable the limit
<mask> entries, _ = l.search(params)
<mask> assert.Equal(t, 10, len(entries))
<mask> }
<mask>
<mask> func TestQueryLogFileDisabled(t *testing.T) {
<mask> conf := Config{
<mask> Enabled: true,
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 5, len(entries))
</s> add assert.Len(t, entries, 5) </s> remove assert.Equal(t, 0, len(entries))
</s> add assert.Empty(t, entries) </s> remove assert.Equal(t, 10, len(entries))
</s> add assert.Len(t, entries, 10) </s> remove assert.Equal(t, 5, len(entries))
</s> add assert.Len(t, entries, 5) </s> remove assert.Equal(t, 1, len(entries))
</s> add assert.Len(t, entries, 1) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/querylog/qlog_test.go |
assert.Len(t, ll, 2) | <mask> // the oldest entry is now removed from mem buffer
<mask>
<mask> params := newSearchParams()
<mask> ll, _ := l.search(params)
<mask> assert.Equal(t, 2, len(ll))
<mask> assert.Equal(t, "example3.org", ll[0].QHost)
<mask> assert.Equal(t, "example2.org", ll[1].QHost)
<mask> }
<mask>
<mask> func addEntry(l *queryLog, host, answerStr, client string) {
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 5, len(entries))
</s> add assert.Len(t, entries, 5) </s> remove assert.Equal(t, 10, len(entries))
</s> add assert.Len(t, entries, 10) </s> remove assert.Equal(t, 1, len(entries))
</s> add assert.Len(t, entries, 1) </s> remove assert.Equal(t, 4, len(entries))
</s> add assert.Len(t, entries, 4) </s> remove assert.Equal(t, 10, len(entries))
</s> add assert.Len(t, entries, 10) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/querylog/qlog_test.go |
assert.Len(t, msg.Answer, 1) | <mask> assert.Equal(t, "IN", entry.QClass)
<mask>
<mask> msg := new(dns.Msg)
<mask> assert.Nil(t, msg.Unpack(entry.Answer))
<mask> assert.Equal(t, 1, len(msg.Answer))
<mask> ip := proxyutil.GetIPFromDNSRecord(msg.Answer[0])
<mask> assert.NotNil(t, ip)
<mask> assert.Equal(t, answer, ip.String())
<mask> return true
<mask> }
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove log.Debug("DNS: internal record: %s -> %s", req.Question[0].Name, ip.String())
</s> add log.Debug("DNS: internal record: %s -> %s", req.Question[0].Name, ip) </s> remove ip := ipFromAddr(d.Addr)
</s> add ip := IPStringFromAddr(d.Addr) </s> remove ip := dnsforward.GetIPString(d.Addr)
</s> add ip := dnsforward.IPStringFromAddr(d.Addr) </s> remove clientAddr := ipFromAddr(d.Addr)
</s> add clientAddr := IPStringFromAddr(d.Addr) </s> remove ip := net.ParseIP(fields[2])
if ip == nil {
return ""
}
return fields[2]
</s> add return net.ParseIP(fields[2]) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/querylog/qlog_test.go |
assert.EqualValues(t, 0, pos) | <mask>
<mask> // seek to the start
<mask> pos, err := q.SeekStart()
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, int64(0), pos)
<mask>
<mask> // try reading anyway
<mask> line, err := q.ReadNext()
<mask> assert.Equal(t, io.EOF, err)
<mask> assert.Equal(t, "", line)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.NotEqual(t, int64(0), pos)
</s> add assert.NotEqualValues(t, 0, pos) </s> remove assert.True(t, pos > 0)
</s> add assert.Greater(t, pos, int64(0)) </s> remove assert.Equal(t, "", line)
</s> add assert.Empty(t, line) </s> remove assert.NotEqual(t, int64(0), pos)
</s> add assert.NotEqualValues(t, 0, pos) </s> remove assert.Equal(t, int64(0), q.position)
assert.True(t, strings.Contains(line, "0.0.0.1"), line)
</s> add assert.EqualValues(t, 0, q.position)
assert.Contains(t, line, "0.0.0.1") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/querylog/qlogfile_test.go |
assert.Empty(t, line) | <mask>
<mask> // try reading anyway
<mask> line, err := q.ReadNext()
<mask> assert.Equal(t, io.EOF, err)
<mask> assert.Equal(t, "", line)
<mask> }
<mask>
<mask> func TestQLogFileLarge(t *testing.T) {
<mask> // should be large enough
<mask> count := 50000
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, int64(0), pos)
</s> add assert.EqualValues(t, 0, pos) </s> remove assert.Equal(t, "", line)
</s> add assert.Empty(t, line) </s> remove assert.Equal(t, "", line)
</s> add assert.Empty(t, line) </s> remove assert.Equal(t, int64(0), q.position)
assert.True(t, strings.Contains(line, "0.0.0.1"), line)
</s> add assert.EqualValues(t, 0, q.position)
assert.Contains(t, line, "0.0.0.1") </s> remove assert.True(t, strings.Contains(line, "0.0.0.2"), line)
</s> add assert.Contains(t, line, "0.0.0.2") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/querylog/qlogfile_test.go |
assert.NotEqualValues(t, 0, pos) | <mask>
<mask> // seek to the start
<mask> pos, err := q.SeekStart()
<mask> assert.Nil(t, err)
<mask> assert.NotEqual(t, int64(0), pos)
<mask>
<mask> read := 0
<mask> var line string
<mask> for err == nil {
<mask> line, err = q.ReadNext()
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, int64(0), pos)
</s> add assert.EqualValues(t, 0, pos) </s> remove assert.True(t, pos > 0)
</s> add assert.Greater(t, pos, int64(0)) </s> remove assert.NotEqual(t, int64(0), pos)
</s> add assert.NotEqualValues(t, 0, pos) </s> remove assert.NotEqual(t, uint64(0), ts)
</s> add assert.NotEqualValues(t, 0, ts) </s> remove assert.True(t, strings.Contains(line, "0.0.0.2"), line)
</s> add assert.Contains(t, line, "0.0.0.2") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/querylog/qlogfile_test.go |
assert.NotZero(t, len(line)) | <mask> var line string
<mask> for err == nil {
<mask> line, err = q.ReadNext()
<mask> if err == nil {
<mask> assert.True(t, len(line) > 0)
<mask> read++
<mask> }
<mask> }
<mask>
<mask> assert.Equal(t, count, read)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.NotEqual(t, int64(0), pos)
</s> add assert.NotEqualValues(t, 0, pos) </s> remove assert.True(t, pos > 0)
</s> add assert.Greater(t, pos, int64(0)) </s> remove assert.True(t, strings.Contains(line, "0.0.0.2"), line)
</s> add assert.Contains(t, line, "0.0.0.2") </s> remove s.conf.routerIP, err = parseIPv4(s.conf.GatewayIP)
</s> add s.conf.routerIP, err = tryTo4(s.conf.GatewayIP) </s> remove s.conf.ipEnd, err = parseIPv4(conf.RangeEnd)
</s> add s.conf.ipEnd, err = tryTo4(conf.RangeEnd) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/querylog/qlogfile_test.go |
assert.NotEqualValues(t, 0, timestamp) | <mask> line, err := getQLogFileLine(q, count/2)
<mask> assert.Nil(t, err)
<mask> // ALMOST the record we need
<mask> timestamp := readQLogTimestamp(line) - 1
<mask> assert.NotEqual(t, uint64(0), timestamp)
<mask> _, depth, err := q.SeekTS(timestamp)
<mask> assert.NotNil(t, err)
<mask> assert.True(t, depth <= int(math.Log2(float64(count))+3))
<mask> }
<mask>
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.NotEqual(t, uint64(0), timestamp)
</s> add assert.NotEqualValues(t, 0, timestamp) </s> remove assert.True(t, depth <= int(math.Log2(float64(count))+3))
</s> add assert.LessOrEqual(t, depth, int(math.Log2(float64(count))+3)) </s> remove assert.True(t, depth <= int(math.Log2(float64(count))+3))
</s> add assert.LessOrEqual(t, depth, int(math.Log2(float64(count))+3)) </s> remove assert.NotEqual(t, uint64(0), ts)
</s> add assert.NotEqualValues(t, 0, ts) </s> remove assert.NotEqual(t, uint64(0), ts)
</s> add assert.NotEqualValues(t, 0, ts) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/querylog/qlogfile_test.go |
assert.LessOrEqual(t, depth, int(math.Log2(float64(count))+3)) | <mask> timestamp := readQLogTimestamp(line) - 1
<mask> assert.NotEqual(t, uint64(0), timestamp)
<mask> _, depth, err := q.SeekTS(timestamp)
<mask> assert.NotNil(t, err)
<mask> assert.True(t, depth <= int(math.Log2(float64(count))+3))
<mask> }
<mask>
<mask> func TestQLogFileSeekSmallFile(t *testing.T) {
<mask> // more or less big file
<mask> count := 10
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, depth <= int(math.Log2(float64(count))+3))
</s> add assert.LessOrEqual(t, depth, int(math.Log2(float64(count))+3)) </s> remove assert.NotEqual(t, uint64(0), timestamp)
</s> add assert.NotEqualValues(t, 0, timestamp) </s> remove assert.NotEqual(t, uint64(0), timestamp)
</s> add assert.NotEqualValues(t, 0, timestamp) </s> remove assert.NotEqual(t, uint64(0), ts)
</s> add assert.NotEqualValues(t, 0, ts) </s> remove assert.NotEqual(t, uint64(0), ts)
</s> add assert.NotEqualValues(t, 0, ts) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/querylog/qlogfile_test.go |
assert.NotEqualValues(t, 0, timestamp) | <mask> line, err := getQLogFileLine(q, count/2)
<mask> assert.Nil(t, err)
<mask> // ALMOST the record we need
<mask> timestamp := readQLogTimestamp(line) - 1
<mask> assert.NotEqual(t, uint64(0), timestamp)
<mask> _, depth, err := q.SeekTS(timestamp)
<mask> assert.NotNil(t, err)
<mask> assert.True(t, depth <= int(math.Log2(float64(count))+3))
<mask> }
<mask>
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/querylog/qlogfile_test.go |
assert.LessOrEqual(t, depth, int(math.Log2(float64(count))+3)) | <mask> timestamp := readQLogTimestamp(line) - 1
<mask> assert.NotEqual(t, uint64(0), timestamp)
<mask> _, depth, err := q.SeekTS(timestamp)
<mask> assert.NotNil(t, err)
<mask> assert.True(t, depth <= int(math.Log2(float64(count))+3))
<mask> }
<mask>
<mask> func testSeekLineQLogFile(t *testing.T, q *QLogFile, lineNumber int) {
<mask> line, err := getQLogFileLine(q, lineNumber)
<mask> assert.Nil(t, err)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.NotEqual(t, uint64(0), timestamp)
</s> add assert.NotEqualValues(t, 0, timestamp) </s> remove assert.NotEqual(t, uint64(0), timestamp)
</s> add assert.NotEqualValues(t, 0, timestamp) </s> remove assert.True(t, depth <= int(math.Log2(float64(count))+3))
</s> add assert.LessOrEqual(t, depth, int(math.Log2(float64(count))+3)) </s> remove assert.NotEqual(t, uint64(0), ts)
</s> add assert.NotEqualValues(t, 0, ts) </s> remove assert.NotEqual(t, uint64(0), ts)
</s> add assert.NotEqualValues(t, 0, ts) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/querylog/qlogfile_test.go |
assert.NotEqualValues(t, 0, ts) | <mask> func testSeekLineQLogFile(t *testing.T, q *QLogFile, lineNumber int) {
<mask> line, err := getQLogFileLine(q, lineNumber)
<mask> assert.Nil(t, err)
<mask> ts := readQLogTimestamp(line)
<mask> assert.NotEqual(t, uint64(0), ts)
<mask>
<mask> // try seeking to that line now
<mask> pos, _, err := q.SeekTS(ts)
<mask> assert.Nil(t, err)
<mask> assert.NotEqual(t, int64(0), pos)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.NotEqual(t, uint64(0), ts)
</s> add assert.NotEqualValues(t, 0, ts) </s> remove assert.NotEqual(t, int64(0), pos)
</s> add assert.NotEqualValues(t, 0, pos) </s> remove assert.True(t, depth <= int(math.Log2(float64(count))+3))
</s> add assert.LessOrEqual(t, depth, int(math.Log2(float64(count))+3)) </s> remove assert.NotEqual(t, int64(0), pos)
</s> add assert.NotEqualValues(t, 0, pos) </s> remove assert.NotEqual(t, uint64(0), timestamp)
</s> add assert.NotEqualValues(t, 0, timestamp) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/querylog/qlogfile_test.go |
assert.NotEqualValues(t, 0, pos) | <mask>
<mask> // try seeking to that line now
<mask> pos, _, err := q.SeekTS(ts)
<mask> assert.Nil(t, err)
<mask> assert.NotEqual(t, int64(0), pos)
<mask>
<mask> testLine, err := q.ReadNext()
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, line, testLine)
<mask> }
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.NotEqual(t, uint64(0), ts)
</s> add assert.NotEqualValues(t, 0, ts) </s> remove assert.NotEqual(t, int64(0), pos)
</s> add assert.NotEqualValues(t, 0, pos) </s> remove assert.NotEqual(t, uint64(0), ts)
</s> add assert.NotEqualValues(t, 0, ts) </s> remove assert.Equal(t, int64(0), pos)
</s> add assert.EqualValues(t, 0, pos) </s> remove assert.True(t, pos > 0)
</s> add assert.Greater(t, pos, int64(0)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/querylog/qlogfile_test.go |
assert.Greater(t, pos, int64(0)) | <mask>
<mask> // seek to the start
<mask> pos, err := q.SeekStart()
<mask> assert.Nil(t, err)
<mask> assert.True(t, pos > 0)
<mask>
<mask> // read first line
<mask> line, err := q.ReadNext()
<mask> assert.Nil(t, err)
<mask> assert.True(t, strings.Contains(line, "0.0.0.2"), line)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, strings.Contains(line, "0.0.0.2"), line)
</s> add assert.Contains(t, line, "0.0.0.2") </s> remove assert.NotEqual(t, int64(0), pos)
</s> add assert.NotEqualValues(t, 0, pos) </s> remove assert.Equal(t, int64(0), pos)
</s> add assert.EqualValues(t, 0, pos) </s> remove assert.Equal(t, int64(0), q.position)
assert.True(t, strings.Contains(line, "0.0.0.1"), line)
</s> add assert.EqualValues(t, 0, q.position)
assert.Contains(t, line, "0.0.0.1") </s> remove assert.NotEqual(t, int64(0), pos)
</s> add assert.NotEqualValues(t, 0, pos) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/querylog/qlogfile_test.go |
assert.Contains(t, line, "0.0.0.2") | <mask>
<mask> // read first line
<mask> line, err := q.ReadNext()
<mask> assert.Nil(t, err)
<mask> assert.True(t, strings.Contains(line, "0.0.0.2"), line)
<mask> assert.True(t, strings.HasPrefix(line, "{"), line)
<mask> assert.True(t, strings.HasSuffix(line, "}"), line)
<mask>
<mask> // read second line
<mask> line, err = q.ReadNext()
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, int64(0), q.position)
assert.True(t, strings.Contains(line, "0.0.0.1"), line)
</s> add assert.EqualValues(t, 0, q.position)
assert.Contains(t, line, "0.0.0.1") </s> remove assert.True(t, pos > 0)
</s> add assert.Greater(t, pos, int64(0)) </s> remove assert.NotEqual(t, int64(0), pos)
</s> add assert.NotEqualValues(t, 0, pos) </s> remove assert.Equal(t, "", line)
</s> add assert.Empty(t, line) </s> remove assert.Equal(t, "", line)
</s> add assert.Empty(t, line) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/querylog/qlogfile_test.go |
assert.EqualValues(t, 0, q.position)
assert.Contains(t, line, "0.0.0.1") | <mask>
<mask> // read second line
<mask> line, err = q.ReadNext()
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, int64(0), q.position)
<mask> assert.True(t, strings.Contains(line, "0.0.0.1"), line)
<mask> assert.True(t, strings.HasPrefix(line, "{"), line)
<mask> assert.True(t, strings.HasSuffix(line, "}"), line)
<mask>
<mask> // try reading again (there's nothing to read anymore)
<mask> line, err = q.ReadNext()
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, strings.Contains(line, "0.0.0.2"), line)
</s> add assert.Contains(t, line, "0.0.0.2") </s> remove assert.Equal(t, "", line)
</s> add assert.Empty(t, line) </s> remove assert.True(t, pos > 0)
</s> add assert.Greater(t, pos, int64(0)) </s> remove assert.Equal(t, int64(0), pos)
</s> add assert.EqualValues(t, 0, pos) </s> remove assert.Equal(t, "", line)
</s> add assert.Empty(t, line) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/querylog/qlogfile_test.go |
assert.Empty(t, line) | <mask>
<mask> // try reading again (there's nothing to read anymore)
<mask> line, err = q.ReadNext()
<mask> assert.Equal(t, io.EOF, err)
<mask> assert.Equal(t, "", line)
<mask> }
<mask>
<mask> // prepareTestFile - prepares a test query log file with the specified number of lines
<mask> func prepareTestFile(dir string, linesCount int) string {
<mask> return prepareTestFiles(dir, 1, linesCount)[0]
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, int64(0), q.position)
assert.True(t, strings.Contains(line, "0.0.0.1"), line)
</s> add assert.EqualValues(t, 0, q.position)
assert.Contains(t, line, "0.0.0.1") </s> remove assert.Equal(t, int64(0), pos)
</s> add assert.EqualValues(t, 0, pos) </s> remove assert.Equal(t, "", line)
</s> add assert.Empty(t, line) </s> remove assert.Equal(t, "", line)
</s> add assert.Empty(t, line) </s> remove assert.True(t, strings.Contains(line, "0.0.0.2"), line)
</s> add assert.Contains(t, line, "0.0.0.2") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/querylog/qlogfile_test.go |
assert.Empty(t, line) | <mask> err = r.SeekStart()
<mask> assert.Nil(t, err)
<mask>
<mask> line, err := r.ReadNext()
<mask> assert.Equal(t, "", line)
<mask> assert.Equal(t, io.EOF, err)
<mask> }
<mask>
<mask> func TestQLogReaderOneFile(t *testing.T) {
<mask> // let's do one small file
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, "", line)
</s> add assert.Empty(t, line) </s> remove assert.Equal(t, "", line)
</s> add assert.Empty(t, line) </s> remove assert.Equal(t, int64(0), pos)
</s> add assert.EqualValues(t, 0, pos) </s> remove assert.True(t, strings.Contains(line, "0.0.0.2"), line)
</s> add assert.Contains(t, line, "0.0.0.2") </s> remove assert.Equal(t, int64(0), q.position)
assert.True(t, strings.Contains(line, "0.0.0.1"), line)
</s> add assert.EqualValues(t, 0, q.position)
assert.Contains(t, line, "0.0.0.1") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/querylog/qlogreader_test.go |
assert.NotEqualValues(t, 0, ts) | <mask> func testSeekLineQLogReader(t *testing.T, r *QLogReader, lineNumber int) {
<mask> line, err := getQLogReaderLine(r, lineNumber)
<mask> assert.Nil(t, err)
<mask> ts := readQLogTimestamp(line)
<mask> assert.NotEqual(t, uint64(0), ts)
<mask>
<mask> // try seeking to that line now
<mask> err = r.SeekTS(ts)
<mask> assert.Nil(t, err)
<mask>
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.NotEqual(t, uint64(0), ts)
</s> add assert.NotEqualValues(t, 0, ts) </s> remove assert.True(t, depth <= int(math.Log2(float64(count))+3))
</s> add assert.LessOrEqual(t, depth, int(math.Log2(float64(count))+3)) </s> remove assert.NotEqual(t, int64(0), pos)
</s> add assert.NotEqualValues(t, 0, pos) </s> remove assert.NotEqual(t, uint64(0), timestamp)
</s> add assert.NotEqualValues(t, 0, timestamp) </s> remove assert.NotEqual(t, uint64(0), timestamp)
</s> add assert.NotEqualValues(t, 0, timestamp) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/querylog/qlogreader_test.go |
e.Client = net.IP{127, 0, 0, 1} | <mask>
<mask> e := Entry{}
<mask>
<mask> e.Domain = "domain"
<mask> e.Client = net.ParseIP("127.0.0.1")
<mask> e.Result = RFiltered
<mask> e.Time = 123456
<mask> s.Update(e)
<mask>
<mask> e.Domain = "domain"
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove e.Client = net.ParseIP("127.0.0.1")
</s> add e.Client = net.IP{127, 0, 0, 1} </s> remove e.Client = net.ParseIP("127.0.0.1")
</s> add e.Client = net.IP{127, 0, 0, 1} </s> remove conf.BlockingIPv4 = "bad IP"
</s> add conf.BlockingIPv4 = nil </s> remove l.IP = net.ParseIP("192.168.10.100").To4()
</s> add l.IP = net.IP{192, 168, 10, 100} </s> remove l2.IP = net.ParseIP("192.168.10.101").To4()
</s> add l2.IP = net.IP{192, 168, 10, 101} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/stats/stats_test.go |
e.Client = net.IP{127, 0, 0, 1} | <mask> e.Time = 123456
<mask> s.Update(e)
<mask>
<mask> e.Domain = "domain"
<mask> e.Client = net.ParseIP("127.0.0.1")
<mask> e.Result = RNotFiltered
<mask> e.Time = 123456
<mask> s.Update(e)
<mask>
<mask> d := s.getData()
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove e.Client = net.ParseIP("127.0.0.1")
</s> add e.Client = net.IP{127, 0, 0, 1} </s> remove e.Client = net.ParseIP("127.0.0.1")
</s> add e.Client = net.IP{127, 0, 0, 1} </s> remove conf.BlockingIPv4 = "bad IP"
</s> add conf.BlockingIPv4 = nil </s> remove l.IP = net.ParseIP("192.168.10.100").To4()
</s> add l.IP = net.IP{192, 168, 10, 100} </s> remove l2.IP = net.ParseIP("192.168.10.101").To4()
</s> add l2.IP = net.IP{192, 168, 10, 101} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/stats/stats_test.go |
assert.EqualValues(t, 1, m[0]["domain"]) | <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, 0}
<mask> assert.True(t, UIntArrayEquals(d["replaced_parental"].([]uint64), a))
<mask>
<mask> m := d["top_queried_domains"].([]map[string]uint64)
<mask> assert.True(t, m[0]["domain"] == 1)
<mask>
<mask> m = d["top_blocked_domains"].([]map[string]uint64)
<mask> assert.True(t, m[0]["domain"] == 1)
<mask>
<mask> m = d["top_clients"].([]map[string]uint64)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, d["num_dns_queries"].(uint64) == 2)
assert.True(t, d["num_blocked_filtering"].(uint64) == 1)
assert.True(t, d["num_replaced_safebrowsing"].(uint64) == 0)
assert.True(t, d["num_replaced_safesearch"].(uint64) == 0)
assert.True(t, d["num_replaced_parental"].(uint64) == 0)
assert.True(t, d["avg_processing_time"].(float64) == 0.123456)
</s> add assert.EqualValues(t, 2, d["num_dns_queries"].(uint64))
assert.EqualValues(t, 1, d["num_blocked_filtering"].(uint64))
assert.EqualValues(t, 0, d["num_replaced_safebrowsing"].(uint64))
assert.EqualValues(t, 0, d["num_replaced_safesearch"].(uint64))
assert.EqualValues(t, 0, d["num_replaced_parental"].(uint64))
assert.EqualValues(t, 0.123456, d["avg_processing_time"].(float64)) </s> remove assert.True(t, m[0]["domain"] == 1)
</s> add assert.EqualValues(t, 1, m[0]["domain"]) </s> remove assert.True(t, reply.Answer[0].(*dns.A).A.Equal(net.ParseIP("0.0.0.0")))
</s> add assert.True(t, reply.Answer[0].(*dns.A).A.Equal(net.IP{0, 0, 0, 0})) </s> remove assert.True(t, len(r.IPList) == 1)
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
</s> add assert.Len(t, r.IPList, 1)
assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 4})) </s> remove e.Client = net.ParseIP("127.0.0.1")
</s> add e.Client = net.IP{127, 0, 0, 1} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/stats/stats_test.go |
assert.EqualValues(t, 1, m[0]["domain"]) | <mask> m := d["top_queried_domains"].([]map[string]uint64)
<mask> assert.True(t, m[0]["domain"] == 1)
<mask>
<mask> m = d["top_blocked_domains"].([]map[string]uint64)
<mask> assert.True(t, m[0]["domain"] == 1)
<mask>
<mask> m = d["top_clients"].([]map[string]uint64)
<mask> assert.True(t, m[0]["127.0.0.1"] == 2)
<mask>
<mask> assert.True(t, d["num_dns_queries"].(uint64) == 2)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, m[0]["127.0.0.1"] == 2)
</s> add assert.EqualValues(t, 2, m[0]["127.0.0.1"]) </s> remove assert.True(t, m[0]["domain"] == 1)
</s> add assert.EqualValues(t, 1, m[0]["domain"]) </s> remove assert.True(t, d["num_dns_queries"].(uint64) == 2)
assert.True(t, d["num_blocked_filtering"].(uint64) == 1)
assert.True(t, d["num_replaced_safebrowsing"].(uint64) == 0)
assert.True(t, d["num_replaced_safesearch"].(uint64) == 0)
assert.True(t, d["num_replaced_parental"].(uint64) == 0)
assert.True(t, d["avg_processing_time"].(float64) == 0.123456)
</s> add assert.EqualValues(t, 2, d["num_dns_queries"].(uint64))
assert.EqualValues(t, 1, d["num_blocked_filtering"].(uint64))
assert.EqualValues(t, 0, d["num_replaced_safebrowsing"].(uint64))
assert.EqualValues(t, 0, d["num_replaced_safesearch"].(uint64))
assert.EqualValues(t, 0, d["num_replaced_parental"].(uint64))
assert.EqualValues(t, 0.123456, d["avg_processing_time"].(float64)) </s> remove assert.Equal(t, 2, len(ls))
</s> add assert.Len(t, ls, 2) </s> remove assert.Equal(t, 2, len(ls))
</s> add assert.Len(t, ls, 2) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/stats/stats_test.go |
assert.EqualValues(t, 2, m[0]["127.0.0.1"]) | <mask> m = d["top_blocked_domains"].([]map[string]uint64)
<mask> assert.True(t, m[0]["domain"] == 1)
<mask>
<mask> m = d["top_clients"].([]map[string]uint64)
<mask> assert.True(t, m[0]["127.0.0.1"] == 2)
<mask>
<mask> assert.True(t, d["num_dns_queries"].(uint64) == 2)
<mask> assert.True(t, d["num_blocked_filtering"].(uint64) == 1)
<mask> assert.True(t, d["num_replaced_safebrowsing"].(uint64) == 0)
<mask> assert.True(t, d["num_replaced_safesearch"].(uint64) == 0)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, m[0]["domain"] == 1)
</s> add assert.EqualValues(t, 1, m[0]["domain"]) </s> remove assert.True(t, d["num_dns_queries"].(uint64) == 2)
assert.True(t, d["num_blocked_filtering"].(uint64) == 1)
assert.True(t, d["num_replaced_safebrowsing"].(uint64) == 0)
assert.True(t, d["num_replaced_safesearch"].(uint64) == 0)
assert.True(t, d["num_replaced_parental"].(uint64) == 0)
assert.True(t, d["avg_processing_time"].(float64) == 0.123456)
</s> add assert.EqualValues(t, 2, d["num_dns_queries"].(uint64))
assert.EqualValues(t, 1, d["num_blocked_filtering"].(uint64))
assert.EqualValues(t, 0, d["num_replaced_safebrowsing"].(uint64))
assert.EqualValues(t, 0, d["num_replaced_safesearch"].(uint64))
assert.EqualValues(t, 0, d["num_replaced_parental"].(uint64))
assert.EqualValues(t, 0.123456, d["avg_processing_time"].(float64)) </s> remove assert.True(t, m[0]["domain"] == 1)
</s> add assert.EqualValues(t, 1, m[0]["domain"]) </s> remove assert.True(t, topClients[0] == "127.0.0.1")
</s> add assert.Equal(t, "127.0.0.1", topClients[0]) </s> remove assert.Equal(t, 2, len(r.IPList))
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
assert.True(t, r.IPList[1].Equal(net.ParseIP("1.2.3.5")))
</s> add assert.Len(t, r.IPList, 2)
assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 4}))
assert.True(t, r.IPList[1].Equal(net.IP{1, 2, 3, 5})) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/stats/stats_test.go |
assert.EqualValues(t, 2, d["num_dns_queries"].(uint64))
assert.EqualValues(t, 1, d["num_blocked_filtering"].(uint64))
assert.EqualValues(t, 0, d["num_replaced_safebrowsing"].(uint64))
assert.EqualValues(t, 0, d["num_replaced_safesearch"].(uint64))
assert.EqualValues(t, 0, d["num_replaced_parental"].(uint64))
assert.EqualValues(t, 0.123456, d["avg_processing_time"].(float64)) | <mask>
<mask> m = d["top_clients"].([]map[string]uint64)
<mask> assert.True(t, m[0]["127.0.0.1"] == 2)
<mask>
<mask> assert.True(t, d["num_dns_queries"].(uint64) == 2)
<mask> assert.True(t, d["num_blocked_filtering"].(uint64) == 1)
<mask> assert.True(t, d["num_replaced_safebrowsing"].(uint64) == 0)
<mask> assert.True(t, d["num_replaced_safesearch"].(uint64) == 0)
<mask> assert.True(t, d["num_replaced_parental"].(uint64) == 0)
<mask> assert.True(t, d["avg_processing_time"].(float64) == 0.123456)
<mask>
<mask> topClients := s.GetTopClientsIP(2)
<mask> assert.True(t, topClients[0] == "127.0.0.1")
<mask>
<mask> s.clear()
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, m[0]["127.0.0.1"] == 2)
</s> add assert.EqualValues(t, 2, m[0]["127.0.0.1"]) </s> remove assert.True(t, topClients[0] == "127.0.0.1")
</s> add assert.Equal(t, "127.0.0.1", topClients[0]) </s> remove assert.True(t, m[0]["domain"] == 1)
</s> add assert.EqualValues(t, 1, m[0]["domain"]) </s> remove assert.True(t, m[0]["domain"] == 1)
</s> add assert.EqualValues(t, 1, m[0]["domain"]) </s> remove assert.True(t, SplitNext(&s, ',') == "a")
assert.True(t, SplitNext(&s, ',') == "b")
assert.True(t, SplitNext(&s, ',') == "c" && len(s) == 0)
</s> add assert.Equal(t, "a", SplitNext(&s, ','))
assert.Equal(t, "b", SplitNext(&s, ','))
assert.Equal(t, "c", SplitNext(&s, ','))
assert.Empty(t, s) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/stats/stats_test.go |
assert.Equal(t, "127.0.0.1", topClients[0]) | <mask> assert.True(t, d["num_replaced_parental"].(uint64) == 0)
<mask> assert.True(t, d["avg_processing_time"].(float64) == 0.123456)
<mask>
<mask> topClients := s.GetTopClientsIP(2)
<mask> assert.True(t, topClients[0] == "127.0.0.1")
<mask>
<mask> s.clear()
<mask> s.Close()
<mask> os.Remove(conf.Filename)
<mask> }
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, d["num_dns_queries"].(uint64) == 2)
assert.True(t, d["num_blocked_filtering"].(uint64) == 1)
assert.True(t, d["num_replaced_safebrowsing"].(uint64) == 0)
assert.True(t, d["num_replaced_safesearch"].(uint64) == 0)
assert.True(t, d["num_replaced_parental"].(uint64) == 0)
assert.True(t, d["avg_processing_time"].(float64) == 0.123456)
</s> add assert.EqualValues(t, 2, d["num_dns_queries"].(uint64))
assert.EqualValues(t, 1, d["num_blocked_filtering"].(uint64))
assert.EqualValues(t, 0, d["num_replaced_safebrowsing"].(uint64))
assert.EqualValues(t, 0, d["num_replaced_safesearch"].(uint64))
assert.EqualValues(t, 0, d["num_replaced_parental"].(uint64))
assert.EqualValues(t, 0.123456, d["avg_processing_time"].(float64)) </s> remove assert.True(t, d["num_dns_queries"].(uint64) == uint64(int(hour)*n))
</s> add assert.EqualValues(t, int(hour)*n, d["num_dns_queries"]) </s> remove assert.True(t, m[0]["127.0.0.1"] == 2)
</s> add assert.EqualValues(t, 2, m[0]["127.0.0.1"]) </s> remove assert.True(t, SplitNext(&s, ',') == "a")
assert.True(t, SplitNext(&s, ',') == "b")
assert.True(t, SplitNext(&s, ',') == "c" && len(s) == 0)
</s> add assert.Equal(t, "a", SplitNext(&s, ','))
assert.Equal(t, "b", SplitNext(&s, ','))
assert.Equal(t, "c", SplitNext(&s, ','))
assert.Empty(t, s) </s> remove assert.True(t, pos > 0)
</s> add assert.Greater(t, pos, int64(0)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/stats/stats_test.go |
e.Client = net.IP{127, 0, 0, 1} | <mask> atomic.AddInt32(&hour, 1)
<mask> }
<mask> for i := 0; i != n; i++ {
<mask> e.Domain = fmt.Sprintf("domain%d", i)
<mask> e.Client = net.ParseIP("127.0.0.1")
<mask> e.Client[2] = byte((i & 0xff00) >> 8)
<mask> e.Client[3] = byte(i & 0xff)
<mask> e.Result = RNotFiltered
<mask> e.Time = 123456
<mask> s.Update(e)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove e.Client = net.ParseIP("127.0.0.1")
</s> add e.Client = net.IP{127, 0, 0, 1} </s> remove e.Client = net.ParseIP("127.0.0.1")
</s> add e.Client = net.IP{127, 0, 0, 1} </s> remove assert.True(t, alen == 30, "i=%d", i)
</s> add assert.Equalf(t, 30, alen, "i=%d", i) </s> remove s.conf.BlockingIPv4 = *dc.BlockingIPv4
s.conf.BlockingIPAddrv4 = net.ParseIP(*dc.BlockingIPv4)
s.conf.BlockingIPv6 = *dc.BlockingIPv6
s.conf.BlockingIPAddrv6 = net.ParseIP(*dc.BlockingIPv6)
</s> add s.conf.BlockingIPv4 = dc.BlockingIPv4.To4()
s.conf.BlockingIPv6 = dc.BlockingIPv6.To16() </s> remove jsonIface.Addrs6 = append(jsonIface.Addrs6, ipnet.IP.String())
</s> add jsonIface.Addrs6 = append(jsonIface.Addrs6, ipnet.IP) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/stats/stats_test.go |
assert.EqualValues(t, int(hour)*n, d["num_dns_queries"]) | <mask> }
<mask> }
<mask>
<mask> d := s.getData()
<mask> assert.True(t, d["num_dns_queries"].(uint64) == uint64(int(hour)*n))
<mask>
<mask> s.Close()
<mask> os.Remove(conf.Filename)
<mask> }
<mask>
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, topClients[0] == "127.0.0.1")
</s> add assert.Equal(t, "127.0.0.1", topClients[0]) </s> remove e.Client = net.ParseIP("127.0.0.1")
</s> add e.Client = net.IP{127, 0, 0, 1} </s> remove assert.True(t, len(r.IPList) == 1)
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
</s> add assert.Len(t, r.IPList, 1)
assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 4})) </s> remove assert.True(t, strings.Contains(q, "7a1b."))
assert.True(t, strings.Contains(q, "af5a."))
assert.True(t, strings.Contains(q, "eb11."))
</s> add assert.Contains(t, q, "7a1b.")
assert.Contains(t, q, "af5a.")
assert.Contains(t, q, "eb11.") </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/stats/stats_test.go |
assert.Equalf(t, 30, alen, "i=%d", i) | <mask>
<mask> func TestAggregateDataPerTimeUnit(t *testing.T) {
<mask> for i := 0; i != 25; i++ {
<mask> alen := aggregateDataPerDay(uint32(i))
<mask> assert.True(t, alen == 30, "i=%d", i)
<mask> }
<mask> }
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove e.Client = net.ParseIP("127.0.0.1")
</s> add e.Client = net.IP{127, 0, 0, 1} </s> remove // Get IP address from net.Addr
func getIP(addr net.Addr) net.IP {
switch addr := addr.(type) {
case *net.UDPAddr:
return addr.IP
case *net.TCPAddr:
return addr.IP
}
return nil
</s> add func stringArrayDup(a []string) []string {
a2 := make([]string, len(a))
copy(a2, a)
return a2 </s> remove assert.True(t, strings.Contains(q, "7a1b."))
assert.True(t, strings.Contains(q, "af5a."))
assert.True(t, strings.Contains(q, "eb11."))
</s> add assert.Contains(t, q, "7a1b.")
assert.Contains(t, q, "af5a.")
assert.Contains(t, q, "eb11.") </s> remove ip4 := net.ParseIP(*req.BlockingIPv4)
if ip4 == nil || ip4.To4() == nil {
return false
}
ip6 := net.ParseIP(*req.BlockingIPv6)
return ip6 != nil
</s> add return req.BlockingIPv6 != nil </s> remove assert.True(t, a.Init(nil, []string{"1.1.1.1", "2.2.0.0/16"}, nil) == nil)
</s> add assert.Nil(t, a.Init(nil, []string{"1.1.1.1", "2.2.0.0/16"}, nil)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/stats/stats_test.go |
func GatewayIP(ifaceName string) net.IP { | <mask> return ifaceSetStaticIP(ifaceName)
<mask> }
<mask>
<mask> // GatewayIP returns IP address of interface's gateway.
<mask> func GatewayIP(ifaceName string) string {
<mask> cmd := exec.Command("ip", "route", "show", "dev", ifaceName)
<mask> log.Tracef("executing %s %v", cmd.Path, cmd.Args)
<mask> d, err := cmd.Output()
<mask> if err != nil || cmd.ProcessState.ExitCode() != 0 {
<mask> return ""
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove return ""
</s> add return nil </s> remove func ipFromAddr(a net.Addr) string {
switch addr := a.(type) {
case *net.UDPAddr:
return addr.IP.String()
case *net.TCPAddr:
return addr.IP.String()
</s> add func IPStringFromAddr(addr net.Addr) (ipstr string) {
if ip := ipFromAddr(addr); ip != nil {
return ip.String() </s> remove ip := net.ParseIP(fields[2])
if ip == nil {
return ""
}
return fields[2]
</s> add return net.ParseIP(fields[2]) </s> remove return ""
</s> add return nil </s> remove subnet, err := parseIPv4(s.conf.SubnetMask)
if err != nil || !isValidSubnetMask(subnet) {
return s, fmt.Errorf("dhcpv4: invalid subnet mask: %s", s.conf.SubnetMask)
</s> add if s.conf.SubnetMask == nil {
return s, fmt.Errorf("dhcpv4: invalid subnet mask: %v", s.conf.SubnetMask) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/sysutil/net.go |
return nil | <mask> cmd := exec.Command("ip", "route", "show", "dev", ifaceName)
<mask> log.Tracef("executing %s %v", cmd.Path, cmd.Args)
<mask> d, err := cmd.Output()
<mask> if err != nil || cmd.ProcessState.ExitCode() != 0 {
<mask> return ""
<mask> }
<mask>
<mask> fields := strings.Fields(string(d))
<mask> // The meaningful "ip route" command output should contain the word
<mask> // "default" at first field and default gateway IP address at third
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove return ""
</s> add return nil </s> remove func GatewayIP(ifaceName string) string {
</s> add func GatewayIP(ifaceName string) net.IP { </s> remove ip := net.ParseIP(fields[2])
if ip == nil {
return ""
}
return fields[2]
</s> add return net.ParseIP(fields[2]) </s> remove ip4 := net.ParseIP(*req.BlockingIPv4)
if ip4 == nil || ip4.To4() == nil {
return false
}
ip6 := net.ParseIP(*req.BlockingIPv6)
return ip6 != nil
</s> add return req.BlockingIPv6 != nil </s> remove subnet, err := parseIPv4(s.conf.SubnetMask)
if err != nil || !isValidSubnetMask(subnet) {
return s, fmt.Errorf("dhcpv4: invalid subnet mask: %s", s.conf.SubnetMask)
</s> add if s.conf.SubnetMask == nil {
return s, fmt.Errorf("dhcpv4: invalid subnet mask: %v", s.conf.SubnetMask) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/sysutil/net.go |
return nil | <mask> // The meaningful "ip route" command output should contain the word
<mask> // "default" at first field and default gateway IP address at third
<mask> // field.
<mask> if len(fields) < 3 || fields[0] != "default" {
<mask> return ""
<mask> }
<mask>
<mask> ip := net.ParseIP(fields[2])
<mask> if ip == nil {
<mask> return ""
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove return ""
</s> add return nil </s> remove ip := net.ParseIP(fields[2])
if ip == nil {
return ""
}
return fields[2]
</s> add return net.ParseIP(fields[2]) </s> remove ip := dnsforward.GetIPString(d.Addr)
</s> add ip := dnsforward.IPStringFromAddr(d.Addr) </s> remove func ipFromAddr(a net.Addr) string {
switch addr := a.(type) {
case *net.UDPAddr:
return addr.IP.String()
case *net.TCPAddr:
return addr.IP.String()
</s> add func IPStringFromAddr(addr net.Addr) (ipstr string) {
if ip := ipFromAddr(addr); ip != nil {
return ip.String() </s> remove func GatewayIP(ifaceName string) string {
</s> add func GatewayIP(ifaceName string) net.IP { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/sysutil/net.go |
return net.ParseIP(fields[2]) | <mask> if len(fields) < 3 || fields[0] != "default" {
<mask> return ""
<mask> }
<mask>
<mask> ip := net.ParseIP(fields[2])
<mask> if ip == nil {
<mask> return ""
<mask> }
<mask>
<mask> return fields[2]
<mask> }
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove return ""
</s> add return nil </s> remove ip := dnsforward.GetIPString(d.Addr)
</s> add ip := dnsforward.IPStringFromAddr(d.Addr) </s> remove ip4 := net.ParseIP(*req.BlockingIPv4)
if ip4 == nil || ip4.To4() == nil {
return false
}
ip6 := net.ParseIP(*req.BlockingIPv6)
return ip6 != nil
</s> add return req.BlockingIPv6 != nil </s> remove ip := net.ParseIP(lj.IP)
if ip != nil && ip.To4() == nil {
mac, err := net.ParseMAC(lj.HWAddr)
</s> add if lj.IP == nil {
httpError(r, w, http.StatusBadRequest, "invalid IP")
return
}
ip4 := lj.IP.To4()
mac, err := net.ParseMAC(lj.HWAddr)
lease := Lease{
HWAddr: mac,
}
if ip4 == nil {
lease.IP = lj.IP.To16()
</s> remove ip := net.ParseIP(lj.IP)
if ip != nil && ip.To4() == nil {
mac, err := net.ParseMAC(lj.HWAddr)
</s> add if lj.IP == nil {
httpError(r, w, http.StatusBadRequest, "invalid IP")
return
}
ip4 := lj.IP.To4()
mac, err := net.ParseMAC(lj.HWAddr)
lease := Lease{
HWAddr: mac,
}
if ip4 == nil {
lease.IP = lj.IP.To16()
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/sysutil/net.go |
add := updateStaticIPdhcpcdConf(ifaceName, ip, gatewayIP, ip4) | <mask> if err != nil {
<mask> return err
<mask> }
<mask> gatewayIP := GatewayIP(ifaceName)
<mask> add := updateStaticIPdhcpcdConf(ifaceName, ip, gatewayIP, ip4.String())
<mask>
<mask> body, err := ioutil.ReadFile("/etc/dhcpcd.conf")
<mask> if err != nil {
<mask> return err
<mask> }
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove ip, _ = parseIPv4(lj.IP)
if ip == nil {
httpError(r, w, http.StatusBadRequest, "invalid IP")
return
}
mac, err := net.ParseMAC(lj.HWAddr)
if err != nil {
httpError(r, w, http.StatusBadRequest, "invalid MAC")
</s> add </s> remove return
}
</s> add </s> remove return
}
</s> add </s> remove ip := net.ParseIP(lj.IP)
if ip != nil && ip.To4() == nil {
mac, err := net.ParseMAC(lj.HWAddr)
</s> add if lj.IP == nil {
httpError(r, w, http.StatusBadRequest, "invalid IP")
return
}
ip4 := lj.IP.To4()
mac, err := net.ParseMAC(lj.HWAddr)
lease := Lease{
HWAddr: mac,
}
if ip4 == nil {
lease.IP = lj.IP.To16()
</s> remove ip := net.ParseIP(lj.IP)
if ip != nil && ip.To4() == nil {
mac, err := net.ParseMAC(lj.HWAddr)
</s> add if lj.IP == nil {
httpError(r, w, http.StatusBadRequest, "invalid IP")
return
}
ip4 := lj.IP.To4()
mac, err := net.ParseMAC(lj.HWAddr)
lease := Lease{
HWAddr: mac,
}
if ip4 == nil {
lease.IP = lj.IP.To16()
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/sysutil/net_linux.go |
func updateStaticIPdhcpcdConf(ifaceName, ip string, gatewayIP, dnsIP net.IP) string { | <mask> }
<mask>
<mask> // updateStaticIPdhcpcdConf sets static IP address for the interface by writing
<mask> // into dhcpd.conf.
<mask> func updateStaticIPdhcpcdConf(ifaceName, ip, gatewayIP, dnsIP string) string {
<mask> var body []byte
<mask>
<mask> add := fmt.Sprintf("\ninterface %s\nstatic ip_address=%s\n",
<mask> ifaceName, ip)
<mask> body = append(body, []byte(add)...)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove if len(gatewayIP) != 0 {
</s> add if gatewayIP != nil { </s> remove add := updateStaticIPdhcpcdConf(ifaceName, ip, gatewayIP, ip4.String())
</s> add add := updateStaticIPdhcpcdConf(ifaceName, ip, gatewayIP, ip4) </s> remove GatewayIP string `yaml:"gateway_ip"`
SubnetMask string `yaml:"subnet_mask"`
</s> add GatewayIP net.IP `yaml:"gateway_ip"`
SubnetMask net.IP `yaml:"subnet_mask"` </s> remove RangeStart string `yaml:"range_start"`
RangeEnd string `yaml:"range_end"`
</s> add RangeStart net.IP `yaml:"range_start"`
RangeEnd net.IP `yaml:"range_end"` </s> remove func GatewayIP(ifaceName string) string {
</s> add func GatewayIP(ifaceName string) net.IP { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/sysutil/net_linux.go |
if gatewayIP != nil { | <mask> add := fmt.Sprintf("\ninterface %s\nstatic ip_address=%s\n",
<mask> ifaceName, ip)
<mask> body = append(body, []byte(add)...)
<mask>
<mask> if len(gatewayIP) != 0 {
<mask> add = fmt.Sprintf("static routers=%s\n",
<mask> gatewayIP)
<mask> body = append(body, []byte(add)...)
<mask> }
<mask>
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove func updateStaticIPdhcpcdConf(ifaceName, ip, gatewayIP, dnsIP string) string {
</s> add func updateStaticIPdhcpcdConf(ifaceName, ip string, gatewayIP, dnsIP net.IP) string { </s> remove jsonIface.Addrs6 = append(jsonIface.Addrs6, ipnet.IP.String())
</s> add jsonIface.Addrs6 = append(jsonIface.Addrs6, ipnet.IP) </s> remove jsonIface.Addrs4 = append(jsonIface.Addrs4, ipnet.IP.String())
</s> add jsonIface.Addrs4 = append(jsonIface.Addrs4, ipnet.IP) </s> remove ld.IP = net.ParseIP("192.168.10.151").To4()
</s> add ld.IP = net.IP{192, 168, 10, 151} </s> remove l.IP = net.ParseIP("192.168.10.150").To4()
</s> add l.IP = net.IP{192, 168, 10, 150} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/sysutil/net_linux.go |
"net" | <mask> import (
<mask> "bytes"
<mask> "testing"
<mask>
<mask> "github.com/stretchr/testify/assert"
<mask> )
<mask>
<mask> const nl = "\n"
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove "strings"
</s> add </s> remove s = updateStaticIPdhcpcdConf("wlan0", "192.168.0.2/24", "", "192.168.0.2")
</s> add s = updateStaticIPdhcpcdConf("wlan0", "192.168.0.2/24", nil, net.IP{192, 168, 0, 2}) </s> remove s := updateStaticIPdhcpcdConf("wlan0", "192.168.0.2/24", "192.168.0.1", "192.168.0.2")
</s> add s := updateStaticIPdhcpcdConf("wlan0", "192.168.0.2/24", net.IP{192, 168, 0, 1}, net.IP{192, 168, 0, 2}) </s> remove assert.True(t, a.Init([]string{"1.1.1.1", "2.2.0.0/16"}, nil, nil) == nil)
</s> add assert.Nil(t, a.Init([]string{"1.1.1.1", "2.2.0.0/16"}, nil, nil)) </s> remove ip := ipFromAddr(d.Addr)
</s> add ip := IPStringFromAddr(d.Addr) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/sysutil/net_linux_test.go |
s := updateStaticIPdhcpcdConf("wlan0", "192.168.0.2/24", net.IP{192, 168, 0, 1}, net.IP{192, 168, 0, 2}) | <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", "192.168.0.1", "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 +
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove s = updateStaticIPdhcpcdConf("wlan0", "192.168.0.2/24", "", "192.168.0.2")
</s> add s = updateStaticIPdhcpcdConf("wlan0", "192.168.0.2/24", nil, net.IP{192, 168, 0, 2}) </s> remove assert.True(t, len(r.IPList) == 1)
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
</s> add assert.Len(t, r.IPList, 1)
assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 4})) </s> remove assert.True(t, len(r.IPList) == 1)
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
</s> add assert.Len(t, r.IPList, 1)
assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 4})) </s> remove assert.True(t, err == nil, "%s", err)
</s> add assert.Nil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/sysutil/net_linux_test.go |
s = updateStaticIPdhcpcdConf("wlan0", "192.168.0.2/24", nil, net.IP{192, 168, 0, 2}) | <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", "", "192.168.0.2")
<mask> assert.Equal(t, dhcpcdConf, s)
<mask> }
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove s := updateStaticIPdhcpcdConf("wlan0", "192.168.0.2/24", "192.168.0.1", "192.168.0.2")
</s> add s := updateStaticIPdhcpcdConf("wlan0", "192.168.0.2/24", net.IP{192, 168, 0, 1}, net.IP{192, 168, 0, 2}) </s> remove assert.True(t, len(r.IPList) == 1)
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
</s> add assert.Len(t, r.IPList, 1)
assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 4})) </s> remove assert.True(t, len(r.IPList) == 1)
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
</s> add assert.Len(t, r.IPList, 1)
assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 4})) </s> remove assert.True(t, err == nil, "%s", err)
</s> add assert.Nil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/sysutil/net_linux_test.go |
assert.Len(t, ips, 1) | <mask>
<mask> // Existing host
<mask> ips := ah.Process("localhost", dns.TypeA)
<mask> assert.NotNil(t, ips)
<mask> assert.Equal(t, 1, len(ips))
<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)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 1, len(ips))
</s> add assert.Len(t, ips, 1) </s> remove assert.Equal(t, "", res.CanonName)
</s> add assert.Empty(t, res.CanonName) </s> remove assert.Equal(t, "", res.CanonName)
assert.Len(t, res.Rules, 0)
</s> add assert.Empty(t, res.CanonName)
assert.Empty(t, res.Rules) </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) </s> remove assert.Len(t, res.Rules, 0)
</s> add assert.Empty(t, res.Rules) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/util/autohosts_test.go |
assert.Len(t, ips, 1) | <mask>
<mask> // Check if we are notified about changes
<mask> ips = ah.Process("newhost", dns.TypeA)
<mask> assert.NotNil(t, ips)
<mask> assert.Equal(t, 1, len(ips))
<mask> assert.Equal(t, "127.0.0.2", ips[0].String())
<mask> }
<mask>
<mask> func TestIP(t *testing.T) {
<mask> assert.Equal(t, "127.0.0.1", DNSUnreverseAddr("1.0.0.127.in-addr.arpa").String())
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 1, len(ips))
</s> add assert.Len(t, ips, 1) </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) </s> remove func TestIpFromAddr(t *testing.T) {
</s> add func TestIPStringFromAddr(t *testing.T) { </s> remove assert.Equal(t, 1, len(config.Upstreams))
assert.Equal(t, 1, len(config.DomainReservedUpstreams))
</s> add assert.Len(t, config.Upstreams, 1)
assert.Len(t, config.DomainReservedUpstreams, 1) </s> remove assert.True(t, clients.ipHost["1.1.1.1"].WhoisInfo[0][1] == "orgname-val")
</s> add assert.Equal(t, "orgname-val", clients.ipHost["1.1.1.1"].WhoisInfo[0][1]) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/util/autohosts_test.go |
assert.Equal(t, "a", SplitNext(&s, ','))
assert.Equal(t, "b", SplitNext(&s, ','))
assert.Equal(t, "c", SplitNext(&s, ','))
assert.Empty(t, s) | <mask> )
<mask>
<mask> func TestSplitNext(t *testing.T) {
<mask> s := " a,b , c "
<mask> assert.True(t, SplitNext(&s, ',') == "a")
<mask> assert.True(t, SplitNext(&s, ',') == "b")
<mask> assert.True(t, SplitNext(&s, ',') == "c" && len(s) == 0)
<mask> }
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, strings.Contains(q, "7a1b."))
assert.True(t, strings.Contains(q, "af5a."))
assert.True(t, strings.Contains(q, "eb11."))
</s> add assert.Contains(t, q, "7a1b.")
assert.Contains(t, q, "af5a.")
assert.Contains(t, q, "eb11.") </s> remove assert.True(t, clients.ipHost["1.1.1.2"] == nil)
</s> add assert.Nil(t, clients.ipHost["1.1.1.2"]) </s> remove assert.True(t, topClients[0] == "127.0.0.1")
</s> add assert.Equal(t, "127.0.0.1", topClients[0]) </s> remove assert.True(t, a.Init([]string{"1.1.1.1", "2.2.0.0/16"}, nil, nil) == nil)
</s> add assert.Nil(t, a.Init([]string{"1.1.1.1", "2.2.0.0/16"}, nil, nil)) </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/util/helpers_test.go |
<mask> Context = homeContext{}
<mask>
<mask> dir := prepareTestDir()
<mask> defer func() { _ = os.RemoveAll(dir) }()
<mask> _ = os.MkdirAll(filepath.Join(Context.getDataDir(), filterDir), 0755)
<mask> fn := filepath.Join(dir, "AdGuardHome.yaml")
<mask>
<mask> assert.True(t, ioutil.WriteFile(fn, []byte(yamlConf), 0644) == nil)
<mask> fn, _ = filepath.Abs(fn)
<mask>
</s> -: fix qlog test on Windows </s> remove params.OlderThan = now
</s> add // In case if the timer is not precise (for instance, on Windows)
// We really want to get all records including those added just before the call
params.OlderThan = now.Add(time.Millisecond) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e96fd6e42dd1545df6ffbfed02a6e27575d3b5a1 | home/home_test.go | |
// Prepare the test config | <mask> defer func() { _ = os.RemoveAll(dir) }()
<mask> fn := filepath.Join(dir, "AdGuardHome.yaml")
<mask>
<mask> assert.True(t, ioutil.WriteFile(fn, []byte(yamlConf), 0644) == nil)
<mask> fn, _ = filepath.Abs(fn)
<mask>
<mask> config = configuration{} // the global variable is dirty because of the previous tests run
</s> -: fix qlog test on Windows </s> remove _ = os.MkdirAll(filepath.Join(Context.getDataDir(), filterDir), 0755)
</s> add </s> remove params.OlderThan = now
</s> add // In case if the timer is not precise (for instance, on Windows)
// We really want to get all records including those added just before the call
params.OlderThan = now.Add(time.Millisecond) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e96fd6e42dd1545df6ffbfed02a6e27575d3b5a1 | home/home_test.go |
// In case if the timer is not precise (for instance, on Windows)
// We really want to get all records including those added just before the call
params.OlderThan = now.Add(time.Millisecond) | <mask> // add from file
<mask> fileEntries, oldest, total := l.searchFiles(params)
<mask>
<mask> if params.OlderThan.IsZero() {
<mask> params.OlderThan = now
<mask> }
<mask>
<mask> // add from memory buffer
<mask> l.bufferLock.Lock()
<mask> total += len(l.buffer)
</s> -: fix qlog test on Windows </s> remove _ = os.MkdirAll(filepath.Join(Context.getDataDir(), filterDir), 0755)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e96fd6e42dd1545df6ffbfed02a6e27575d3b5a1 | querylog/qlog.go |
hosts := []string{}
err := json.NewDecoder(r.Body).Decode(&hosts) | <mask> }
<mask>
<mask> func handleTestUpstreamDNS(w http.ResponseWriter, r *http.Request) {
<mask> log.Tracef("%s %v", r.Method, r.URL)
<mask> body, err := ioutil.ReadAll(r.Body)
<mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "Failed to read request body: %s", err)
<mask> return
<mask> }
<mask> hosts := strings.Fields(string(body))
</s> [change] control, openapi: Handle upstreams test with JSON </s> remove hosts := strings.Fields(string(body))
</s> add </s> remove - in: body
name: upstream
description: 'Upstream servers, separated by newline or space, port is optional after colon'
</s> add - in: "body"
name: "body"
description: "Upstream servers to be tested" </s> remove # TODO: use JSON
type: string
example: |
1.1.1.1
1.0.0.1
8.8.8.8 8.8.4.4
192.168.1.104:53535
</s> add $ref: "#/definitions/TestUpstreams" </s> remove - text/plain
</s> add - application/json | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e973c4b174d9249cb05f01faa9d7662f2f04d55e | control.go |
<mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "Failed to read request body: %s", err)
<mask> return
<mask> }
<mask> hosts := strings.Fields(string(body))
<mask>
<mask> if len(hosts) == 0 {
<mask> httpError(w, http.StatusBadRequest, "No servers specified")
<mask> return
<mask> }
</s> [change] control, openapi: Handle upstreams test with JSON </s> remove body, err := ioutil.ReadAll(r.Body)
</s> add hosts := []string{}
err := json.NewDecoder(r.Body).Decode(&hosts) </s> remove - in: body
name: upstream
description: 'Upstream servers, separated by newline or space, port is optional after colon'
</s> add - in: "body"
name: "body"
description: "Upstream servers to be tested" </s> remove # TODO: use JSON
type: string
example: |
1.1.1.1
1.0.0.1
8.8.8.8 8.8.4.4
192.168.1.104:53535
</s> add $ref: "#/definitions/TestUpstreams" </s> remove - text/plain
</s> add - application/json | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e973c4b174d9249cb05f01faa9d7662f2f04d55e | control.go | |
summary: "Test upstream DNS" | <mask> post:
<mask> tags:
<mask> - global
<mask> operationId: testUpstreamDNS
<mask> summary: 'Test upstream DNS'
<mask> consumes:
<mask> - text/plain
<mask> parameters:
<mask> - in: body
<mask> name: upstream
</s> [change] control, openapi: Handle upstreams test with JSON </s> remove - text/plain
</s> add - application/json </s> remove - in: body
name: upstream
description: 'Upstream servers, separated by newline or space, port is optional after colon'
</s> add - in: "body"
name: "body"
description: "Upstream servers to be tested" </s> remove # TODO: use JSON
type: string
example: |
1.1.1.1
1.0.0.1
8.8.8.8 8.8.4.4
192.168.1.104:53535
</s> add $ref: "#/definitions/TestUpstreams" </s> remove hosts := strings.Fields(string(body))
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e973c4b174d9249cb05f01faa9d7662f2f04d55e | openapi/openapi.yaml |
- application/json | <mask> - global
<mask> operationId: testUpstreamDNS
<mask> summary: 'Test upstream DNS'
<mask> consumes:
<mask> - text/plain
<mask> parameters:
<mask> - in: body
<mask> name: upstream
<mask> description: 'Upstream servers, separated by newline or space, port is optional after colon'
<mask> schema:
</s> [change] control, openapi: Handle upstreams test with JSON </s> remove summary: 'Test upstream DNS'
</s> add summary: "Test upstream DNS" </s> remove - in: body
name: upstream
description: 'Upstream servers, separated by newline or space, port is optional after colon'
</s> add - in: "body"
name: "body"
description: "Upstream servers to be tested" </s> remove # TODO: use JSON
type: string
example: |
1.1.1.1
1.0.0.1
8.8.8.8 8.8.4.4
192.168.1.104:53535
</s> add $ref: "#/definitions/TestUpstreams" </s> remove hosts := strings.Fields(string(body))
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e973c4b174d9249cb05f01faa9d7662f2f04d55e | openapi/openapi.yaml |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.