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 |
|---|---|---|---|---|
- in: "body"
name: "body"
description: "Upstream servers to be tested" | <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:
<mask> # TODO: use JSON
<mask> type: string
<mask> example: |
<mask> 1.1.1.1
</s> [change] control, openapi: Handle upstreams test with JSON </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 </s> remove summary: 'Test upstream DNS'
</s> add summary: "Test upstream DNS" </s> remove hosts := strings.Fields(string(body))
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e973c4b174d9249cb05f01faa9d7662f2f04d55e | openapi/openapi.yaml |
$ref: "#/definitions/TestUpstreams" | <mask> - in: body
<mask> name: upstream
<mask> description: 'Upstream servers, separated by newline or space, port is optional after colon'
<mask> schema:
<mask> # TODO: use JSON
<mask> type: string
<mask> example: |
<mask> 1.1.1.1
<mask> 1.0.0.1
<mask> 8.8.8.8 8.8.4.4
<mask> 192.168.1.104:53535
<mask> responses:
<mask> 200:
<mask> description: 'Status of testing each requested server, with "OK" meaning that server works, any other text means an error.'
<mask> examples:
<mask> application/json:
</s> [change] control, openapi: Handle upstreams test with 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 - text/plain
</s> add - application/json </s> remove summary: 'Test upstream DNS'
</s> add summary: "Test upstream DNS" </s> remove hosts := strings.Fields(string(body))
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e973c4b174d9249cb05f01faa9d7662f2f04d55e | openapi/openapi.yaml |
TestUpstreams:
type: "object"
description: "Upstream servers to be tested"
required:
- "upstream_dns"
properties:
upstream_dns:
type: "array"
description: 'Upstream servers, port is optional after colon'
items:
type: "string"
example:
- "tls://1.1.1.1"
- "tls://1.0.0.1" | <mask> all_servers:
<mask> type: "boolean"
<mask> description: "If true, parallel queries to all configured upstream servers are enabled"
<mask> Filter:
<mask> type: "object"
<mask> description: "Filter subscription info"
<mask> required:
<mask> - "enabled"
<mask> - "id"
</s> [change] control, openapi: Handle upstreams test with 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 - text/plain
</s> add - application/json </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 summary: 'Test upstream DNS'
</s> add summary: "Test upstream DNS" </s> remove hosts := strings.Fields(string(body))
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e973c4b174d9249cb05f01faa9d7662f2f04d55e | openapi/openapi.yaml |
if filepath.IsAbs(ls.LogFile) {
logFilePath = ls.LogFile
}
file, err := os.OpenFile(logFilePath, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0644) | <mask> log.Fatalf("cannot initialize syslog: %s", err)
<mask> }
<mask> } else {
<mask> logFilePath := filepath.Join(config.ourWorkingDir, ls.LogFile)
<mask> file, err := os.OpenFile(logFilePath, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0755)
<mask> if err != nil {
<mask> log.Fatalf("cannot create a log file: %s", err)
<mask> }
<mask> log.SetOutput(file)
<mask> }
</s> Fix #606, Fix #610 [change] app, config: add symlink support, allow to specify absolute path in log_file </s> remove configFile = filepath.Join(config.ourWorkingDir, config.ourConfigFilename)
</s> add configFile = filepath.Join(config.ourWorkingDir, configFile) </s> remove configFile := config.ourConfigFilename
</s> add configFile, err := filepath.EvalSymlinks(config.ourConfigFilename)
if err != nil {
if !os.IsNotExist(err) {
log.Error("unexpected error while config file path evaluation: %s", err)
}
configFile = config.ourConfigFilename
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e9d20651e98adbae88161a6458bdaa12c9624fcb | app.go |
configFile, err := filepath.EvalSymlinks(config.ourConfigFilename)
if err != nil {
if !os.IsNotExist(err) {
log.Error("unexpected error while config file path evaluation: %s", err)
}
configFile = config.ourConfigFilename
} | <mask> }
<mask>
<mask> // getConfigFilename returns path to the current config file
<mask> func (c *configuration) getConfigFilename() string {
<mask> configFile := config.ourConfigFilename
<mask> if !filepath.IsAbs(configFile) {
<mask> configFile = filepath.Join(config.ourWorkingDir, config.ourConfigFilename)
<mask> }
<mask> return configFile
<mask> }
</s> Fix #606, Fix #610 [change] app, config: add symlink support, allow to specify absolute path in log_file </s> remove file, err := os.OpenFile(logFilePath, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0755)
</s> add if filepath.IsAbs(ls.LogFile) {
logFilePath = ls.LogFile
}
file, err := os.OpenFile(logFilePath, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0644) </s> remove configFile = filepath.Join(config.ourWorkingDir, config.ourConfigFilename)
</s> add configFile = filepath.Join(config.ourWorkingDir, configFile) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e9d20651e98adbae88161a6458bdaa12c9624fcb | config.go |
configFile = filepath.Join(config.ourWorkingDir, configFile) | <mask> // getConfigFilename returns path to the current config file
<mask> func (c *configuration) getConfigFilename() string {
<mask> configFile := config.ourConfigFilename
<mask> if !filepath.IsAbs(configFile) {
<mask> configFile = filepath.Join(config.ourWorkingDir, config.ourConfigFilename)
<mask> }
<mask> return configFile
<mask> }
<mask>
<mask> // getLogSettings reads logging settings from the config file.
</s> Fix #606, Fix #610 [change] app, config: add symlink support, allow to specify absolute path in log_file </s> remove file, err := os.OpenFile(logFilePath, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0755)
</s> add if filepath.IsAbs(ls.LogFile) {
logFilePath = ls.LogFile
}
file, err := os.OpenFile(logFilePath, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0644) </s> remove configFile := config.ourConfigFilename
</s> add configFile, err := filepath.EvalSymlinks(config.ourConfigFilename)
if err != nil {
if !os.IsNotExist(err) {
log.Error("unexpected error while config file path evaluation: %s", err)
}
configFile = config.ourConfigFilename
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e9d20651e98adbae88161a6458bdaa12c9624fcb | config.go |
if len(filter.Rules) == 0 { | <mask> // This is okay for the first start, the filter will be loaded later
<mask> log.Printf("Couldn't load filter %d contents due to %s", filter.ID, err)
<mask> // clear LastUpdated so it gets fetched right away
<mask> }
<mask> if len(filter.Contents) == 0 {
<mask> filter.LastUpdated = time.Time{}
<mask> }
<mask> }
<mask>
<mask> // Update filters we've just loaded right away, don't wait for periodic update timer
</s> User rules -- hold them as a slice of strings, which is how dns forwarding server will expect them. </s> remove return rulesCount, name
</s> add return rulesCount, name, lines </s> remove // TODO: This should be calculated when UserRules are set
var contents []byte
for _, rule := range config.UserRules {
contents = append(contents, []byte(rule)...)
contents = append(contents, '\n')
}
userFilter := filter{
</s> add return filter{ </s> remove Contents []byte `json:"-" yaml:"-"` // not in yaml or json
</s> add Rules []string `json:"-" yaml:"-"` // not in yaml or json </s> remove if bytes.Equal(filter.Contents, body) {
</s> add if reflect.DeepEqual(filter.Rules, rules) { </s> remove return safeWriteFile(filterFilePath, filter.Contents)
</s> add return safeWriteFile(filterFilePath, body) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea1353422f557eaa371f7a430c588a4e7297ed14 | app.go |
Rules []string `json:"-" yaml:"-"` // not in yaml or json | <mask> RulesCount int `json:"rulesCount" yaml:"-"`
<mask> LastUpdated time.Time `json:"lastUpdated,omitempty" yaml:"last_updated,omitempty"`
<mask> ID int64 `json:"id"` // auto-assigned when filter is added (see nextFilterID), json by default keeps ID uppercase but we need lowercase
<mask>
<mask> Contents []byte `json:"-" yaml:"-"` // not in yaml or json
<mask> }
<mask>
<mask> var defaultDNS = []string{"tls://1.1.1.1", "tls://1.0.0.1"}
<mask>
<mask> // initialize to default values, will be changed later when reading config or parsing command line
</s> User rules -- hold them as a slice of strings, which is how dns forwarding server will expect them. </s> remove // TODO: This should be calculated when UserRules are set
var contents []byte
for _, rule := range config.UserRules {
contents = append(contents, []byte(rule)...)
contents = append(contents, '\n')
}
userFilter := filter{
</s> add return filter{ </s> remove if len(filter.Contents) == 0 {
</s> add if len(filter.Rules) == 0 { </s> remove return rulesCount, name
</s> add return rulesCount, name, lines </s> remove if bytes.Equal(filter.Contents, body) {
</s> add if reflect.DeepEqual(filter.Rules, rules) { </s> remove filter.Contents = body
</s> add filter.Rules = rules | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea1353422f557eaa371f7a430c588a4e7297ed14 | config.go |
return filter{ | <mask> }
<mask>
<mask> // Creates a helper object for working with the user rules
<mask> func userFilter() filter {
<mask> // TODO: This should be calculated when UserRules are set
<mask> var contents []byte
<mask> for _, rule := range config.UserRules {
<mask> contents = append(contents, []byte(rule)...)
<mask> contents = append(contents, '\n')
<mask> }
<mask>
<mask> userFilter := filter{
<mask> // User filter always has constant ID=0
<mask> ID: userFilterID,
<mask> Contents: contents,
<mask> Enabled: true,
<mask> }
</s> User rules -- hold them as a slice of strings, which is how dns forwarding server will expect them. </s> remove ID: userFilterID,
Contents: contents,
Enabled: true,
</s> add ID: userFilterID,
Rules: config.UserRules,
Enabled: true, </s> remove
return userFilter
</s> add </s> remove if len(filter.Contents) == 0 {
</s> add if len(filter.Rules) == 0 { </s> remove func parseFilterContents(contents []byte) (int, string) {
</s> add func parseFilterContents(contents []byte) (int, string, []string) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea1353422f557eaa371f7a430c588a4e7297ed14 | config.go |
ID: userFilterID,
Rules: config.UserRules,
Enabled: true, | <mask> }
<mask>
<mask> userFilter := filter{
<mask> // User filter always has constant ID=0
<mask> ID: userFilterID,
<mask> Contents: contents,
<mask> Enabled: true,
<mask> }
<mask>
<mask> return userFilter
<mask> }
<mask>
</s> User rules -- hold them as a slice of strings, which is how dns forwarding server will expect them. </s> remove // TODO: This should be calculated when UserRules are set
var contents []byte
for _, rule := range config.UserRules {
contents = append(contents, []byte(rule)...)
contents = append(contents, '\n')
}
userFilter := filter{
</s> add return filter{ </s> remove
return userFilter
</s> add </s> remove filter.Contents = body
</s> add filter.Rules = rules </s> remove if bytes.Equal(filter.Contents, body) {
</s> add if reflect.DeepEqual(filter.Rules, rules) { </s> remove rulesCount, filterName := parseFilterContents(body)
</s> add rulesCount, filterName, rules := parseFilterContents(body) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea1353422f557eaa371f7a430c588a4e7297ed14 | config.go |
<mask> ID: userFilterID,
<mask> Contents: contents,
<mask> Enabled: true,
<mask> }
<mask>
<mask> return userFilter
<mask> }
<mask>
<mask> // Loads configuration from the YAML file
<mask> func parseConfig() error {
<mask> configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> User rules -- hold them as a slice of strings, which is how dns forwarding server will expect them. </s> remove ID: userFilterID,
Contents: contents,
Enabled: true,
</s> add ID: userFilterID,
Rules: config.UserRules,
Enabled: true, </s> remove // TODO: This should be calculated when UserRules are set
var contents []byte
for _, rule := range config.UserRules {
contents = append(contents, []byte(rule)...)
contents = append(contents, '\n')
}
userFilter := filter{
</s> add return filter{ </s> remove return safeWriteFile(filterFilePath, filter.Contents)
</s> add return safeWriteFile(filterFilePath, body) </s> remove filter.Contents = body
</s> add filter.Rules = rules | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea1353422f557eaa371f7a430c588a4e7297ed14 | config.go | |
<mask> package main
<mask>
<mask> import (
<mask> "bytes"
<mask> "encoding/json"
<mask> "fmt"
<mask> "io/ioutil"
<mask> "log"
<mask> "net/http"
</s> User rules -- hold them as a slice of strings, which is how dns forwarding server will expect them. </s> remove func parseFilterContents(contents []byte) (int, string) {
</s> add func parseFilterContents(contents []byte) (int, string, []string) { </s> remove Contents []byte `json:"-" yaml:"-"` // not in yaml or json
</s> add Rules []string `json:"-" yaml:"-"` // not in yaml or json </s> remove // TODO: This should be calculated when UserRules are set
var contents []byte
for _, rule := range config.UserRules {
contents = append(contents, []byte(rule)...)
contents = append(contents, '\n')
}
userFilter := filter{
</s> add return filter{ | [
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea1353422f557eaa371f7a430c588a4e7297ed14 | control.go | |
"reflect" | <mask> "net/http"
<mask> "os"
<mask> "path/filepath"
<mask> "regexp"
<mask> "strconv"
<mask> "strings"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/upstream"
</s> User rules -- hold them as a slice of strings, which is how dns forwarding server will expect them. </s> remove "bytes"
</s> add </s> remove func parseFilterContents(contents []byte) (int, string) {
</s> add func parseFilterContents(contents []byte) (int, string, []string) { </s> remove Contents []byte `json:"-" yaml:"-"` // not in yaml or json
</s> add Rules []string `json:"-" yaml:"-"` // not in yaml or json </s> remove // TODO: This should be calculated when UserRules are set
var contents []byte
for _, rule := range config.UserRules {
contents = append(contents, []byte(rule)...)
contents = append(contents, '\n')
}
userFilter := filter{
</s> add return filter{ | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea1353422f557eaa371f7a430c588a4e7297ed14 | control.go |
func parseFilterContents(contents []byte) (int, string, []string) { | <mask> return updateCount
<mask> }
<mask>
<mask> // A helper function that parses filter contents and returns a number of rules and a filter name (if there's any)
<mask> func parseFilterContents(contents []byte) (int, string) {
<mask> lines := strings.Split(string(contents), "\n")
<mask> rulesCount := 0
<mask> name := ""
<mask> seenTitle := false
<mask>
</s> User rules -- hold them as a slice of strings, which is how dns forwarding server will expect them. </s> remove rulesCount, filterName := parseFilterContents(body)
</s> add rulesCount, filterName, rules := parseFilterContents(body) </s> remove // TODO: This should be calculated when UserRules are set
var contents []byte
for _, rule := range config.UserRules {
contents = append(contents, []byte(rule)...)
contents = append(contents, '\n')
}
userFilter := filter{
</s> add return filter{ </s> remove return rulesCount, name
</s> add return rulesCount, name, lines | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea1353422f557eaa371f7a430c588a4e7297ed14 | control.go |
return rulesCount, name, lines | <mask> rulesCount++
<mask> }
<mask> }
<mask>
<mask> return rulesCount, name
<mask> }
<mask>
<mask> // Checks for filters updates
<mask> // If "force" is true -- does not check the filter's LastUpdated field
<mask> // Call "save" to persist the filter contents
</s> User rules -- hold them as a slice of strings, which is how dns forwarding server will expect them. </s> remove if len(filter.Contents) == 0 {
</s> add if len(filter.Rules) == 0 { </s> remove // TODO: This should be calculated when UserRules are set
var contents []byte
for _, rule := range config.UserRules {
contents = append(contents, []byte(rule)...)
contents = append(contents, '\n')
}
userFilter := filter{
</s> add return filter{ </s> remove rulesCount, filterName := parseFilterContents(body)
</s> add rulesCount, filterName, rules := parseFilterContents(body) </s> remove Contents []byte `json:"-" yaml:"-"` // not in yaml or json
</s> add Rules []string `json:"-" yaml:"-"` // not in yaml or json | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea1353422f557eaa371f7a430c588a4e7297ed14 | control.go |
rulesCount, filterName, rules := parseFilterContents(body) | <mask> return false, err
<mask> }
<mask>
<mask> // Extract filter name and count number of rules
<mask> rulesCount, filterName := parseFilterContents(body)
<mask>
<mask> if filterName != "" {
<mask> filter.Name = filterName
<mask> }
<mask>
</s> User rules -- hold them as a slice of strings, which is how dns forwarding server will expect them. </s> remove if bytes.Equal(filter.Contents, body) {
</s> add if reflect.DeepEqual(filter.Rules, rules) { </s> remove func parseFilterContents(contents []byte) (int, string) {
</s> add func parseFilterContents(contents []byte) (int, string, []string) { </s> remove log.Printf("Filter %d length is %d", filter.ID, len(filterFileContents))
filter.Contents = filterFileContents
</s> add log.Printf("File %s, id %d, length %d", filterFilePath, filter.ID, len(filterFileContents))
rulesCount, _, rules := parseFilterContents(filterFileContents) </s> remove // Now extract the rules count
rulesCount, _ := parseFilterContents(filter.Contents)
</s> add </s> remove return rulesCount, name
</s> add return rulesCount, name, lines | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea1353422f557eaa371f7a430c588a4e7297ed14 | control.go |
if reflect.DeepEqual(filter.Rules, rules) { | <mask> filter.Name = filterName
<mask> }
<mask>
<mask> // Check if the filter has been really changed
<mask> if bytes.Equal(filter.Contents, body) {
<mask> log.Printf("The filter %d text has not changed", filter.ID)
<mask> return false, nil
<mask> }
<mask>
<mask> log.Printf("Filter %d has been updated: %d bytes, %d rules", filter.ID, len(body), rulesCount)
</s> User rules -- hold them as a slice of strings, which is how dns forwarding server will expect them. </s> remove filter.Contents = body
</s> add filter.Rules = rules </s> remove rulesCount, filterName := parseFilterContents(body)
</s> add rulesCount, filterName, rules := parseFilterContents(body) </s> remove return safeWriteFile(filterFilePath, filter.Contents)
</s> add return safeWriteFile(filterFilePath, body) </s> remove log.Printf("Filter %d length is %d", filter.ID, len(filterFileContents))
filter.Contents = filterFileContents
</s> add log.Printf("File %s, id %d, length %d", filterFilePath, filter.ID, len(filterFileContents))
rulesCount, _, rules := parseFilterContents(filterFileContents) </s> remove if len(filter.Contents) == 0 {
</s> add if len(filter.Rules) == 0 { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea1353422f557eaa371f7a430c588a4e7297ed14 | control.go |
filter.Rules = rules | <mask> }
<mask>
<mask> log.Printf("Filter %d has been updated: %d bytes, %d rules", filter.ID, len(body), rulesCount)
<mask> filter.RulesCount = rulesCount
<mask> filter.Contents = body
<mask>
<mask> return true, nil
<mask> }
<mask>
<mask> // saves filter contents to the file in dataDir
</s> User rules -- hold them as a slice of strings, which is how dns forwarding server will expect them. </s> remove if bytes.Equal(filter.Contents, body) {
</s> add if reflect.DeepEqual(filter.Rules, rules) { </s> remove // Now extract the rules count
rulesCount, _ := parseFilterContents(filter.Contents)
</s> add </s> remove log.Printf("Filter %d length is %d", filter.ID, len(filterFileContents))
filter.Contents = filterFileContents
</s> add log.Printf("File %s, id %d, length %d", filterFilePath, filter.ID, len(filterFileContents))
rulesCount, _, rules := parseFilterContents(filterFileContents) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea1353422f557eaa371f7a430c588a4e7297ed14 | control.go |
body := []byte(strings.Join(filter.Rules, "\n")) | <mask> func (filter *filter) save() error {
<mask> filterFilePath := filter.Path()
<mask> log.Printf("Saving filter %d contents to: %s", filter.ID, filterFilePath)
<mask>
<mask> return safeWriteFile(filterFilePath, body)
<mask> }
<mask>
<mask> // loads filter contents from the file in dataDir
</s> User rules -- hold them as a slice of strings, which is how dns forwarding server will expect them. </s> remove return safeWriteFile(filterFilePath, filter.Contents)
</s> add return safeWriteFile(filterFilePath, body) </s> remove
return userFilter
</s> add </s> remove filter.Contents = body
</s> add filter.Rules = rules </s> remove if bytes.Equal(filter.Contents, body) {
</s> add if reflect.DeepEqual(filter.Rules, rules) { </s> remove if len(filter.Contents) == 0 {
</s> add if len(filter.Rules) == 0 { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea1353422f557eaa371f7a430c588a4e7297ed14 | control.go |
return safeWriteFile(filterFilePath, body) | <mask> func (filter *filter) save() error {
<mask> filterFilePath := filter.Path()
<mask> log.Printf("Saving filter %d contents to: %s", filter.ID, filterFilePath)
<mask>
<mask> return safeWriteFile(filterFilePath, filter.Contents)
<mask> }
<mask>
<mask> // loads filter contents from the file in dataDir
<mask> func (filter *filter) load() error {
<mask> if !filter.Enabled {
</s> User rules -- hold them as a slice of strings, which is how dns forwarding server will expect them. </s> remove
return userFilter
</s> add </s> remove filter.Contents = body
</s> add filter.Rules = rules </s> remove func parseFilterContents(contents []byte) (int, string) {
</s> add func parseFilterContents(contents []byte) (int, string, []string) { </s> remove if len(filter.Contents) == 0 {
</s> add if len(filter.Rules) == 0 { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea1353422f557eaa371f7a430c588a4e7297ed14 | control.go |
log.Printf("File %s, id %d, length %d", filterFilePath, filter.ID, len(filterFileContents))
rulesCount, _, rules := parseFilterContents(filterFileContents) | <mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> log.Printf("Filter %d length is %d", filter.ID, len(filterFileContents))
<mask> filter.Contents = filterFileContents
<mask>
<mask> // Now extract the rules count
<mask> rulesCount, _ := parseFilterContents(filter.Contents)
<mask> filter.RulesCount = rulesCount
<mask>
</s> User rules -- hold them as a slice of strings, which is how dns forwarding server will expect them. </s> remove // Now extract the rules count
rulesCount, _ := parseFilterContents(filter.Contents)
</s> add </s> remove rulesCount, filterName := parseFilterContents(body)
</s> add rulesCount, filterName, rules := parseFilterContents(body) </s> remove filter.Contents = body
</s> add filter.Rules = rules </s> remove if bytes.Equal(filter.Contents, body) {
</s> add if reflect.DeepEqual(filter.Rules, rules) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea1353422f557eaa371f7a430c588a4e7297ed14 | control.go |
<mask>
<mask> log.Printf("Filter %d length is %d", filter.ID, len(filterFileContents))
<mask> filter.Contents = filterFileContents
<mask>
<mask> // Now extract the rules count
<mask> rulesCount, _ := parseFilterContents(filter.Contents)
<mask> filter.RulesCount = rulesCount
<mask>
<mask> return nil
<mask> }
<mask>
</s> User rules -- hold them as a slice of strings, which is how dns forwarding server will expect them. </s> remove log.Printf("Filter %d length is %d", filter.ID, len(filterFileContents))
filter.Contents = filterFileContents
</s> add log.Printf("File %s, id %d, length %d", filterFilePath, filter.ID, len(filterFileContents))
rulesCount, _, rules := parseFilterContents(filterFileContents) </s> remove filter.Contents = body
</s> add filter.Rules = rules </s> remove rulesCount, filterName := parseFilterContents(body)
</s> add rulesCount, filterName, rules := parseFilterContents(body) </s> remove if bytes.Equal(filter.Contents, body) {
</s> add if reflect.DeepEqual(filter.Rules, rules) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea1353422f557eaa371f7a430c588a4e7297ed14 | control.go | |
filter.Rules = rules | <mask> rulesCount, _, rules := parseFilterContents(filterFileContents)
<mask>
<mask> filter.RulesCount = rulesCount
<mask>
<mask> return nil
<mask> }
<mask>
<mask> // Path to the filter contents
</s> User rules -- hold them as a slice of strings, which is how dns forwarding server will expect them. </s> remove log.Printf("Filter %d length is %d", filter.ID, len(filterFileContents))
filter.Contents = filterFileContents
</s> add log.Printf("File %s, id %d, length %d", filterFilePath, filter.ID, len(filterFileContents))
rulesCount, _, rules := parseFilterContents(filterFileContents) </s> remove // Now extract the rules count
rulesCount, _ := parseFilterContents(filter.Contents)
</s> add </s> remove filter.Contents = body
</s> add filter.Rules = rules </s> remove return rulesCount, name
</s> add return rulesCount, name, lines </s> remove rulesCount, filterName := parseFilterContents(body)
</s> add rulesCount, filterName, rules := parseFilterContents(body) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea1353422f557eaa371f7a430c588a4e7297ed14 | control.go |
// Error implements the error interface for LimitReachedError. | <mask> type LimitReachedError struct {
<mask> Limit int64
<mask> }
<mask>
<mask> // Error implements error interface for LimitReachedError.
<mask> //
<mask> // TODO(a.garipov): Think about error string format.
<mask> func (lre *LimitReachedError) Error() string {
<mask> return fmt.Sprintf("attempted to read more than %d bytes", lre.Limit)
<mask> }
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove testCases := []struct {
err error
name string
want string
}{{
err: &LimitReachedError{
Limit: 0,
},
name: "simplest",
want: "attempted to read more than 0 bytes",
}}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
assert.Equal(t, tc.want, tc.err.Error())
})
}
</s> add testutil.AssertErrorMsg(t, "attempted to read more than 0 bytes", &LimitReachedError{
Limit: 0,
}) </s> remove want error
name string
n int64
</s> add wantErrMsg string
name string
n int64 </s> remove want: nil,
name: "positive",
n: 1,
</s> add wantErrMsg: "",
name: "positive",
n: 1, </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/aghio/limitedreader.go |
<mask> package aghio
<mask>
<mask> import (
<mask> "fmt"
<mask> "io"
<mask> "strings"
<mask> "testing"
<mask>
<mask> "github.com/stretchr/testify/assert"
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove "strings"
</s> add | [
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/aghio/limitedreader_test.go | |
"github.com/AdguardTeam/golibs/testutil" | <mask> "testing"
<mask>
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
<mask>
<mask> func TestLimitReader(t *testing.T) {
<mask> testCases := []struct {
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove want error
name string
n int64
</s> add wantErrMsg string
name string
n int64 | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/aghio/limitedreader_test.go |
wantErrMsg string
name string
n int64 | <mask> )
<mask>
<mask> func TestLimitReader(t *testing.T) {
<mask> testCases := []struct {
<mask> want error
<mask> name string
<mask> n int64
<mask> }{{
<mask> want: nil,
<mask> name: "positive",
<mask> n: 1,
<mask> }, {
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove want: nil,
name: "positive",
n: 1,
</s> add wantErrMsg: "",
name: "positive",
n: 1, </s> remove want: nil,
name: "zero",
n: 0,
</s> add wantErrMsg: "",
name: "zero",
n: 0, </s> remove want: fmt.Errorf("aghio: invalid n in LimitReader: -1"),
name: "negative",
n: -1,
</s> add wantErrMsg: "aghio: invalid n in LimitReader: -1",
name: "negative",
n: -1, </s> remove testCases := []struct {
err error
name string
want string
}{{
err: &LimitReachedError{
Limit: 0,
},
name: "simplest",
want: "attempted to read more than 0 bytes",
}}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
assert.Equal(t, tc.want, tc.err.Error())
})
}
</s> add testutil.AssertErrorMsg(t, "attempted to read more than 0 bytes", &LimitReachedError{
Limit: 0,
}) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/aghio/limitedreader_test.go |
wantErrMsg: "",
name: "positive",
n: 1, | <mask> want error
<mask> name string
<mask> n int64
<mask> }{{
<mask> want: nil,
<mask> name: "positive",
<mask> n: 1,
<mask> }, {
<mask> want: nil,
<mask> name: "zero",
<mask> n: 0,
<mask> }, {
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove want: nil,
name: "zero",
n: 0,
</s> add wantErrMsg: "",
name: "zero",
n: 0, </s> remove want error
name string
n int64
</s> add wantErrMsg string
name string
n int64 </s> remove want: fmt.Errorf("aghio: invalid n in LimitReader: -1"),
name: "negative",
n: -1,
</s> add wantErrMsg: "aghio: invalid n in LimitReader: -1",
name: "negative",
n: -1, </s> remove testCases := []struct {
err error
name string
want string
}{{
err: &LimitReachedError{
Limit: 0,
},
name: "simplest",
want: "attempted to read more than 0 bytes",
}}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
assert.Equal(t, tc.want, tc.err.Error())
})
}
</s> add testutil.AssertErrorMsg(t, "attempted to read more than 0 bytes", &LimitReachedError{
Limit: 0,
}) </s> remove // Error implements error interface for LimitReachedError.
</s> add // Error implements the error interface for LimitReachedError. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/aghio/limitedreader_test.go |
wantErrMsg: "",
name: "zero",
n: 0, | <mask> want: nil,
<mask> name: "positive",
<mask> n: 1,
<mask> }, {
<mask> want: nil,
<mask> name: "zero",
<mask> n: 0,
<mask> }, {
<mask> want: fmt.Errorf("aghio: invalid n in LimitReader: -1"),
<mask> name: "negative",
<mask> n: -1,
<mask> }}
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove want: fmt.Errorf("aghio: invalid n in LimitReader: -1"),
name: "negative",
n: -1,
</s> add wantErrMsg: "aghio: invalid n in LimitReader: -1",
name: "negative",
n: -1, </s> remove want: nil,
name: "positive",
n: 1,
</s> add wantErrMsg: "",
name: "positive",
n: 1, </s> remove want error
name string
n int64
</s> add wantErrMsg string
name string
n int64 </s> remove testCases := []struct {
err error
name string
want string
}{{
err: &LimitReachedError{
Limit: 0,
},
name: "simplest",
want: "attempted to read more than 0 bytes",
}}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
assert.Equal(t, tc.want, tc.err.Error())
})
}
</s> add testutil.AssertErrorMsg(t, "attempted to read more than 0 bytes", &LimitReachedError{
Limit: 0,
}) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/aghio/limitedreader_test.go |
wantErrMsg: "aghio: invalid n in LimitReader: -1",
name: "negative",
n: -1, | <mask> want: nil,
<mask> name: "zero",
<mask> n: 0,
<mask> }, {
<mask> want: fmt.Errorf("aghio: invalid n in LimitReader: -1"),
<mask> name: "negative",
<mask> n: -1,
<mask> }}
<mask>
<mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> _, err := LimitReader(nil, tc.n)
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove want: nil,
name: "zero",
n: 0,
</s> add wantErrMsg: "",
name: "zero",
n: 0, </s> remove want: nil,
name: "positive",
n: 1,
</s> add wantErrMsg: "",
name: "positive",
n: 1, </s> remove want error
name string
n int64
</s> add wantErrMsg string
name string
n int64 </s> remove assert.Equal(t, tc.want, err)
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove testCases := []struct {
err error
name string
want string
}{{
err: &LimitReachedError{
Limit: 0,
},
name: "simplest",
want: "attempted to read more than 0 bytes",
}}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
assert.Equal(t, tc.want, tc.err.Error())
})
}
</s> add testutil.AssertErrorMsg(t, "attempted to read more than 0 bytes", &LimitReachedError{
Limit: 0,
}) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/aghio/limitedreader_test.go |
testutil.AssertErrorMsg(t, tc.wantErrMsg, err) | <mask>
<mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> _, err := LimitReader(nil, tc.n)
<mask> assert.Equal(t, tc.want, err)
<mask> })
<mask> }
<mask> }
<mask>
<mask> func TestLimitedReader_Read(t *testing.T) {
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove if tc.wantErrMsg == "" {
assert.NoError(t, err)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove if tc.wantErrMsg == "" {
assert.NoError(t, err)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove if tc.wantErrMsg == "" {
assert.NoError(t, err)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove r, err := newIPRange(tc.start, tc.end)
if tc.wantErrMsg == "" {
assert.NoError(t, err)
assert.NotNil(t, r)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add _, err := newIPRange(tc.start, tc.end)
testutil.AssertErrorMsg(t, tc.wantErrMsg, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/aghio/limitedreader_test.go |
readCloser := io.NopCloser(strings.NewReader(tc.rStr))
lreader, err := LimitReader(readCloser, tc.limit)
require.NoError(t, err)
require.NotNil(t, lreader)
| <mask>
<mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> buf := make([]byte, tc.limit+1)
<mask> n, rerr := lreader.Read(buf)
<mask> require.Equal(t, rerr, tc.err)
<mask>
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove readCloser := io.NopCloser(strings.NewReader(tc.rStr))
</s> add </s> remove lreader, err := LimitReader(readCloser, tc.limit)
require.NoError(t, err)
n, err := lreader.Read(buf)
require.Equal(t, tc.err, err)
</s> add </s> remove assert.Equal(t, tc.want, err)
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/aghio/limitedreader_test.go |
<mask> }}
<mask>
<mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> readCloser := io.NopCloser(strings.NewReader(tc.rStr))
<mask> buf := make([]byte, tc.limit+1)
<mask>
<mask> lreader, err := LimitReader(readCloser, tc.limit)
<mask> require.NoError(t, err)
<mask>
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove lreader, err := LimitReader(readCloser, tc.limit)
require.NoError(t, err)
n, err := lreader.Read(buf)
require.Equal(t, tc.err, err)
</s> add </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/aghio/limitedreader_test.go | |
n, rerr := lreader.Read(buf)
require.Equal(t, rerr, tc.err) | <mask>
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> buf := make([]byte, tc.limit+1)
<mask>
<mask> assert.Equal(t, tc.want, n)
<mask> })
<mask> }
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove lreader, err := LimitReader(readCloser, tc.limit)
require.NoError(t, err)
n, err := lreader.Read(buf)
require.Equal(t, tc.err, err)
</s> add </s> remove readCloser := io.NopCloser(strings.NewReader(tc.rStr))
</s> add </s> remove assert.Equal(t, tc.want, err)
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove if tc.wantErrMsg == "" {
assert.NoError(t, err)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/aghio/limitedreader_test.go |
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> readCloser := io.NopCloser(strings.NewReader(tc.rStr))
<mask> buf := make([]byte, tc.limit+1)
<mask>
<mask> lreader, err := LimitReader(readCloser, tc.limit)
<mask> require.NoError(t, err)
<mask>
<mask> n, err := lreader.Read(buf)
<mask> require.Equal(t, tc.err, err)
<mask> assert.Equal(t, tc.want, n)
<mask> })
<mask> }
<mask> }
<mask>
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove readCloser := io.NopCloser(strings.NewReader(tc.rStr))
</s> add </s> remove assert.Equal(t, tc.want, err)
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove if tc.wantErrMsg == "" {
assert.NoError(t, err)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/aghio/limitedreader_test.go | |
testutil.AssertErrorMsg(t, "attempted to read more than 0 bytes", &LimitReachedError{
Limit: 0,
}) | <mask> }
<mask> }
<mask>
<mask> func TestLimitedReader_LimitReachedError(t *testing.T) {
<mask> testCases := []struct {
<mask> err error
<mask> name string
<mask> want string
<mask> }{{
<mask> err: &LimitReachedError{
<mask> Limit: 0,
<mask> },
<mask> name: "simplest",
<mask> want: "attempted to read more than 0 bytes",
<mask> }}
<mask>
<mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> assert.Equal(t, tc.want, tc.err.Error())
<mask> })
<mask> }
<mask> }
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove want error
name string
n int64
</s> add wantErrMsg string
name string
n int64 </s> remove want: nil,
name: "positive",
n: 1,
</s> add wantErrMsg: "",
name: "positive",
n: 1, </s> remove want: fmt.Errorf("aghio: invalid n in LimitReader: -1"),
name: "negative",
n: -1,
</s> add wantErrMsg: "aghio: invalid n in LimitReader: -1",
name: "negative",
n: -1, </s> remove assert.Equal(t, tc.want, err)
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove // Error implements error interface for LimitReachedError.
</s> add // Error implements the error interface for LimitReachedError. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/aghio/limitedreader_test.go |
<mask> package dhcpd
<mask>
<mask> import (
<mask> "net"
<mask> "strings"
<mask> "testing"
<mask>
<mask> "github.com/google/gopacket"
<mask> "github.com/google/gopacket/layers"
<mask> "github.com/insomniacslk/dhcp/dhcpv4"
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove "fmt"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/dhcpd/conn_unix_test.go | |
"github.com/AdguardTeam/golibs/testutil" | <mask> "net"
<mask> "testing"
<mask>
<mask> "github.com/google/gopacket"
<mask> "github.com/google/gopacket/layers"
<mask> "github.com/insomniacslk/dhcp/dhcpv4"
<mask> "github.com/mdlayher/raw"
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove "strings"
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/dhcpd/conn_unix_test.go |
testutil.AssertErrorMsg(t, "peer is of unexpected type *dhcpd.unexpectedAddrType", err) | <mask> conn := &dhcpConn{}
<mask> n, err := conn.WriteTo(nil, &unexpectedAddrType{})
<mask> require.Error(t, err)
<mask>
<mask> assert.True(t, strings.Contains(err.Error(), "peer is of unexpected type"))
<mask> assert.Zero(t, n)
<mask> })
<mask> }
<mask>
<mask> func TestBuildEtherPkt(t *testing.T) {
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove lreader, err := LimitReader(readCloser, tc.limit)
require.NoError(t, err)
n, err := lreader.Read(buf)
require.Equal(t, tc.err, err)
</s> add </s> remove require.Error(t, err)
assert.Equal(t, "unexpected type of dns: int", err.Error())
</s> add testutil.AssertErrorMsg(t, "unexpected type of dns: int", err) </s> remove require.Error(t, err)
assert.Equal(t, "unexpected type of dns: int", err.Error())
</s> add testutil.AssertErrorMsg(t, "unexpected type of dns: int", err) </s> remove h := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
</s> add h := http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/dhcpd/conn_unix_test.go |
testutil.CleanupAndRequireSuccess(t, func() (err error) { return os.Remove(dbFilename) }) | <mask>
<mask> err = s.dbStore()
<mask> require.NoError(t, err)
<mask>
<mask> t.Cleanup(func() {
<mask> assert.NoError(t, os.Remove(dbFilename))
<mask> })
<mask>
<mask> err = s.srv4.ResetLeases(nil)
<mask> require.NoError(t, err)
<mask>
<mask> err = s.dbLoad()
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove t.Cleanup(func() {
require.NoError(t, f.Close())
})
</s> add testutil.CleanupAndRequireSuccess(t, f.Close) </s> remove require.Nil(t, err)
t.Cleanup(func() {
assert.Nil(t, file.Close())
})
</s> add require.NoError(t, err)
testutil.CleanupAndRequireSuccess(t, file.Close) </s> remove require.Nil(t, err)
t.Cleanup(func() {
assert.Nil(t, f.Close())
})
</s> add require.NoError(t, err)
testutil.CleanupAndRequireSuccess(t, f.Close) </s> remove t.Cleanup(func() {
s.Close()
})
</s> add t.Cleanup(s.Close) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/dhcpd/dhcpd_test.go |
require.NoError(t, err) | <mask> h := s.notImplemented("never!")
<mask>
<mask> w := httptest.NewRecorder()
<mask> r, err := http.NewRequest(http.MethodGet, "/unsupported", nil)
<mask> require.Nil(t, err)
<mask>
<mask> h(w, r)
<mask> assert.Equal(t, http.StatusNotImplemented, w.Code)
<mask> assert.Equal(t, `{"message":"never!"}`+"\n", w.Body.String())
<mask> }
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, s.Start())
t.Cleanup(func() {
require.Nil(t, s.Stop())
})
</s> add require.NoError(t, s.Start())
testutil.CleanupAndRequireSuccess(t, s.Stop) </s> remove assert.Nil(t, err)
t.Cleanup(func() {
assert.Nil(t, s.Stop())
})
</s> add assert.NoError(t, err)
testutil.CleanupAndRequireSuccess(t, s.Stop) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, os.WriteFile(glFilePrefix+"test", data, 0o644))
</s> add require.NoError(t, os.WriteFile(glFilePrefix+"test", data, 0o644)) </s> remove r, err := newIPRange(tc.start, tc.end)
if tc.wantErrMsg == "" {
assert.NoError(t, err)
assert.NotNil(t, r)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add _, err := newIPRange(tc.start, tc.end)
testutil.AssertErrorMsg(t, tc.wantErrMsg, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/dhcpd/http_test.go |
"github.com/AdguardTeam/golibs/testutil" | <mask> "net"
<mask> "testing"
<mask>
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
<mask>
<mask> func TestNewIPRange(t *testing.T) {
<mask> start4 := net.IP{0, 0, 0, 1}
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/dhcpd/iprange_test.go |
_, err := newIPRange(tc.start, tc.end)
testutil.AssertErrorMsg(t, tc.wantErrMsg, err) | <mask> }}
<mask>
<mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> r, err := newIPRange(tc.start, tc.end)
<mask> if tc.wantErrMsg == "" {
<mask> assert.NoError(t, err)
<mask> assert.NotNil(t, r)
<mask> } else {
<mask> require.Error(t, err)
<mask> assert.Equal(t, tc.wantErrMsg, err.Error())
<mask> }
<mask> })
<mask> }
<mask> }
<mask>
<mask> func TestIPRange_Contains(t *testing.T) {
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove if tc.wantErrMsg == "" {
assert.NoError(t, err)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove if tc.wantErrMsg == "" {
assert.NoError(t, err)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove if tc.wantErrMsg == "" {
assert.NoError(t, err)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove if tc.wantErrMsg == "" {
assert.NoError(t, err)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove if tc.wantErrMsg == "" {
assert.NoError(t, err)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/dhcpd/iprange_test.go |
"github.com/AdguardTeam/golibs/testutil" | <mask> "encoding/json"
<mask> "testing"
<mask>
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
<mask>
<mask> func TestNullBool_UnmarshalJSON(t *testing.T) {
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/dhcpd/nullbool_test.go |
testutil.AssertErrorMsg(t, tc.wantErrMsg, err) | <mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> var got nullBool
<mask> err := got.UnmarshalJSON(tc.data)
<mask> if tc.wantErrMsg == "" {
<mask> assert.NoError(t, err)
<mask> } else {
<mask> require.Error(t, err)
<mask>
<mask> assert.Equal(t, tc.wantErrMsg, err.Error())
<mask> }
<mask>
<mask> assert.Equal(t, tc.want, got)
<mask> })
<mask> }
<mask>
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove if tc.wantErrMsg == "" {
assert.NoError(t, err)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove if tc.wantErrMsg == "" {
assert.NoError(t, err)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove r, err := newIPRange(tc.start, tc.end)
if tc.wantErrMsg == "" {
assert.NoError(t, err)
assert.NotNil(t, r)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add _, err := newIPRange(tc.start, tc.end)
testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove if tc.wantErrMsg == "" {
assert.NoError(t, err)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove if tc.wantErrMsg == "" {
assert.NoError(t, err)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/dhcpd/nullbool_test.go |
"github.com/AdguardTeam/golibs/testutil" | <mask> "strings"
<mask> "testing"
<mask>
<mask> "github.com/AdguardTeam/golibs/stringutil"
<mask> "github.com/insomniacslk/dhcp/dhcpv4"
<mask> "github.com/mdlayher/raw"
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove "strings"
</s> add </s> remove "fmt"
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/dhcpd/v4_test.go |
testutil.AssertErrorMsg(t, tc.wantErrMsg, err) | <mask>
<mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> got, err := normalizeHostname(tc.hostname)
<mask> if tc.wantErrMsg == "" {
<mask> assert.NoError(t, err)
<mask> } else {
<mask> require.Error(t, err)
<mask>
<mask> assert.Equal(t, tc.wantErrMsg, err.Error())
<mask> }
<mask>
<mask> assert.Equal(t, tc.want, got)
<mask> })
<mask> }
<mask> }
<mask>
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove if tc.wantErrMsg == "" {
assert.NoError(t, err)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove if tc.wantErrMsg == "" {
assert.NoError(t, err)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove r, err := newIPRange(tc.start, tc.end)
if tc.wantErrMsg == "" {
assert.NoError(t, err)
assert.NotNil(t, r)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add _, err := newIPRange(tc.start, tc.end)
testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove if tc.wantErrMsg == "" {
assert.NoError(t, err)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove if tc.wantErrMsg == "" {
assert.NoError(t, err)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/dhcpd/v4_test.go |
"github.com/AdguardTeam/golibs/testutil" | <mask> "net/url"
<mask> "testing"
<mask>
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/lucas-clemente/quic-go"
<mask> "github.com/stretchr/testify/assert"
<mask> )
<mask>
<mask> // testTLSConn is a tlsConn for tests.
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove "github.com/stretchr/testify/require"
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/dnsforward/clientid_test.go |
<mask>
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/lucas-clemente/quic-go"
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
<mask>
<mask> // testTLSConn is a tlsConn for tests.
<mask> type testTLSConn struct {
<mask> // Conn is embedded here simply to make testTLSConn a net.Conn without
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove assert.True(t, strings.Contains(err.Error(), "peer is of unexpected type"))
</s> add testutil.AssertErrorMsg(t, "peer is of unexpected type *dhcpd.unexpectedAddrType", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/dnsforward/clientid_test.go | |
testutil.AssertErrorMsg(t, tc.wantErrMsg, err) | <mask>
<mask> clientID, err := srv.clientIDFromDNSContext(pctx)
<mask> assert.Equal(t, tc.wantClientID, clientID)
<mask>
<mask> if tc.wantErrMsg == "" {
<mask> assert.NoError(t, err)
<mask> } else {
<mask> require.Error(t, err)
<mask>
<mask> assert.Equal(t, tc.wantErrMsg, err.Error())
<mask> }
<mask> })
<mask> }
<mask> }
<mask>
<mask> func TestClientIDFromDNSContextHTTPS(t *testing.T) {
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove if tc.wantErrMsg == "" {
assert.NoError(t, err)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove if tc.wantErrMsg == "" {
assert.NoError(t, err)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove if tc.wantErrMsg == "" {
assert.NoError(t, err)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove if tc.wantErrMsg == "" {
assert.NoError(t, err)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove if tc.wantErrMsg == "" {
assert.NoError(t, err)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/dnsforward/clientid_test.go |
testutil.AssertErrorMsg(t, tc.wantErrMsg, err) | <mask>
<mask> clientID, err := clientIDFromDNSContextHTTPS(pctx)
<mask> assert.Equal(t, tc.wantClientID, clientID)
<mask>
<mask> if tc.wantErrMsg == "" {
<mask> assert.NoError(t, err)
<mask> } else {
<mask> require.Error(t, err)
<mask>
<mask> assert.Equal(t, tc.wantErrMsg, err.Error())
<mask> }
<mask> })
<mask> }
<mask> }
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove if tc.wantErrMsg == "" {
assert.NoError(t, err)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove if tc.wantErrMsg == "" {
assert.NoError(t, err)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove if tc.wantErrMsg == "" {
assert.NoError(t, err)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove if tc.wantErrMsg == "" {
assert.NoError(t, err)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove if tc.wantErrMsg == "" {
assert.NoError(t, err)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/dnsforward/clientid_test.go |
"github.com/AdguardTeam/golibs/testutil" | <mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/AdguardTeam/golibs/errors"
<mask> "github.com/AdguardTeam/golibs/timeutil"
<mask> "github.com/miekg/dns"
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/dnsforward/dnsforward_test.go |
testutil.CleanupAndRequireSuccess(t, s.Stop) | <mask>
<mask> err := s.Start()
<mask> require.NoErrorf(t, err, "failed to start server: %s", err)
<mask>
<mask> t.Cleanup(func() {
<mask> serr := s.Stop()
<mask> require.NoErrorf(t, serr, "dns server failed to stop: %s", serr)
<mask> })
<mask> }
<mask>
<mask> func createTestServer(
<mask> t *testing.T,
<mask> filterConf *filtering.Config,
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.NotNilf(t, err, "expected an error because %s but no error returned", descr)
</s> add require.Error(t, err) </s> remove assert.Nil(t, err)
</s> add require.NoError(t, err) </s> remove t.Cleanup(func() { assert.Nil(t, l.Close()) })
</s> add testutil.CleanupAndRequireSuccess(t, l.Close) </s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove t.Cleanup(func() {
s.Close()
})
</s> add t.Cleanup(s.Close) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/dnsforward/dnsforward_test.go |
t.Cleanup(s.Close) | <mask>
<mask> err = s.Start()
<mask> require.NoError(t, err)
<mask>
<mask> t.Cleanup(func() {
<mask> s.Close()
<mask> })
<mask>
<mask> addr := s.dnsProxy.Addr(proxy.ProtoUDP)
<mask> req := createTestMessageWithType("34.12.168.192.in-addr.arpa.", dns.TypePTR)
<mask>
<mask> resp, err := dns.Exchange(req, addr.String())
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove t.Cleanup(func() {
s.Close()
})
</s> add t.Cleanup(s.Close) </s> remove assert.Nil(t, err)
t.Cleanup(func() {
assert.Nil(t, s.Stop())
})
</s> add assert.NoError(t, err)
testutil.CleanupAndRequireSuccess(t, s.Stop) </s> remove require.Nil(t, err)
t.Cleanup(func() {
</s> add require.NoError(t, err)
testutil.CleanupAndRequireSuccess(t, func() (err error) { </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/dnsforward/dnsforward_test.go |
t.Cleanup(s.Close) | <mask> require.NoError(t, err)
<mask>
<mask> err = s.Start()
<mask> require.NoError(t, err)
<mask> t.Cleanup(func() {
<mask> s.Close()
<mask> })
<mask>
<mask> subTestFunc := func(t *testing.T) {
<mask> addr := s.dnsProxy.Addr(proxy.ProtoUDP)
<mask> req := createTestMessageWithType("1.0.0.127.in-addr.arpa.", dns.TypePTR)
<mask>
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove t.Cleanup(func() {
s.Close()
})
</s> add t.Cleanup(s.Close) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add </s> remove require.Nil(t, err)
t.Cleanup(func() {
</s> add require.NoError(t, err)
testutil.CleanupAndRequireSuccess(t, func() (err error) { </s> remove assert.Nil(t, err)
t.Cleanup(func() {
assert.Nil(t, s.Stop())
})
</s> add assert.NoError(t, err)
testutil.CleanupAndRequireSuccess(t, s.Stop) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/dnsforward/dnsforward_test.go |
testutil.AssertErrorMsg(t, tc.wantErrMsg, err) | <mask>
<mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> _, err := NewServer(tc.in)
<mask> if tc.wantErrMsg == "" {
<mask> assert.NoError(t, err)
<mask> } else {
<mask> require.Error(t, err)
<mask> assert.Equal(t, tc.wantErrMsg, err.Error())
<mask> }
<mask> })
<mask> }
<mask> }
<mask>
<mask> func TestServer_Exchange(t *testing.T) {
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove if tc.wantErrMsg == "" {
assert.NoError(t, err)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove if tc.wantErrMsg == "" {
assert.NoError(t, err)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove r, err := newIPRange(tc.start, tc.end)
if tc.wantErrMsg == "" {
assert.NoError(t, err)
assert.NotNil(t, r)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add _, err := newIPRange(tc.start, tc.end)
testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove if tc.wantErrMsg == "" {
assert.NoError(t, err)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove if tc.wantErrMsg == "" {
assert.NoError(t, err)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/dnsforward/dnsforward_test.go |
require.NoError(t, err) | <mask> d := &proxy.DNSContext{}
<mask>
<mask> err := srv.filterDNSRewrite(req, res, d)
<mask>
<mask> assert.Equal(t, dns.RcodeNameError, d.Res.Rcode)
<mask> })
<mask>
<mask> t.Run("noerror_empty", func(t *testing.T) {
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, err)
</s> add </s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
| [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/dnsforward/dnsrewrite_test.go |
<mask> d := &proxy.DNSContext{}
<mask>
<mask> err := srv.filterDNSRewrite(req, res, d)
<mask>
<mask> require.Nil(t, err)
<mask> assert.Equal(t, dns.RcodeNameError, d.Res.Rcode)
<mask> })
<mask>
<mask> t.Run("noerror_empty", func(t *testing.T) {
<mask> req := makeQ(dns.TypeA)
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/dnsforward/dnsrewrite_test.go | |
require.NoError(t, err)
| <mask> res := makeRes(dns.RcodeSuccess, 0, nil)
<mask> d := &proxy.DNSContext{}
<mask>
<mask> err := srv.filterDNSRewrite(req, res, d)
<mask> require.Nil(t, err)
<mask> assert.Equal(t, dns.RcodeSuccess, d.Res.Rcode)
<mask> assert.Empty(t, d.Res.Answer)
<mask> })
<mask>
<mask> t.Run("noerror_a", func(t *testing.T) {
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/dnsforward/dnsrewrite_test.go |
require.NoError(t, err)
| <mask> res := makeRes(dns.RcodeSuccess, dns.TypeA, ip4)
<mask> d := &proxy.DNSContext{}
<mask>
<mask> err := srv.filterDNSRewrite(req, res, d)
<mask> require.Nil(t, err)
<mask> assert.Equal(t, dns.RcodeSuccess, d.Res.Rcode)
<mask>
<mask> require.Len(t, d.Res.Answer, 1)
<mask> assert.Equal(t, ip4, d.Res.Answer[0].(*dns.A).A)
<mask> })
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/dnsforward/dnsrewrite_test.go |
require.NoError(t, err)
| <mask> res := makeRes(dns.RcodeSuccess, dns.TypeAAAA, ip6)
<mask> d := &proxy.DNSContext{}
<mask>
<mask> err := srv.filterDNSRewrite(req, res, d)
<mask> require.Nil(t, err)
<mask> assert.Equal(t, dns.RcodeSuccess, d.Res.Rcode)
<mask>
<mask> require.Len(t, d.Res.Answer, 1)
<mask> assert.Equal(t, ip6, d.Res.Answer[0].(*dns.AAAA).AAAA)
<mask> })
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/dnsforward/dnsrewrite_test.go |
require.NoError(t, err)
| <mask> res := makeRes(dns.RcodeSuccess, dns.TypePTR, domain)
<mask> d := &proxy.DNSContext{}
<mask>
<mask> err := srv.filterDNSRewrite(req, res, d)
<mask> require.Nil(t, err)
<mask> assert.Equal(t, dns.RcodeSuccess, d.Res.Rcode)
<mask>
<mask> require.Len(t, d.Res.Answer, 1)
<mask> assert.Equal(t, dns.Fqdn(domain), d.Res.Answer[0].(*dns.PTR).Ptr)
<mask> })
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/dnsforward/dnsrewrite_test.go |
require.NoError(t, err)
| <mask> res := makeRes(dns.RcodeSuccess, dns.TypeTXT, domain)
<mask> d := &proxy.DNSContext{}
<mask>
<mask> err := srv.filterDNSRewrite(req, res, d)
<mask> require.Nil(t, err)
<mask> assert.Equal(t, dns.RcodeSuccess, d.Res.Rcode)
<mask>
<mask> require.Len(t, d.Res.Answer, 1)
<mask> assert.Equal(t, []string{domain}, d.Res.Answer[0].(*dns.TXT).Txt)
<mask> })
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/dnsforward/dnsrewrite_test.go |
require.NoError(t, err)
| <mask> res := makeRes(dns.RcodeSuccess, dns.TypeMX, mxVal)
<mask> d := &proxy.DNSContext{}
<mask>
<mask> err := srv.filterDNSRewrite(req, res, d)
<mask> require.Nil(t, err)
<mask> assert.Equal(t, dns.RcodeSuccess, d.Res.Rcode)
<mask>
<mask> require.Len(t, d.Res.Answer, 1)
<mask> ans, ok := d.Res.Answer[0].(*dns.MX)
<mask>
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/dnsforward/dnsrewrite_test.go |
require.NoError(t, err)
| <mask> res := makeRes(dns.RcodeSuccess, dns.TypeSVCB, svcbVal)
<mask> d := &proxy.DNSContext{}
<mask>
<mask> err := srv.filterDNSRewrite(req, res, d)
<mask> require.Nil(t, err)
<mask> assert.Equal(t, dns.RcodeSuccess, d.Res.Rcode)
<mask>
<mask> require.Len(t, d.Res.Answer, 1)
<mask> ans, ok := d.Res.Answer[0].(*dns.SVCB)
<mask> require.True(t, ok)
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/dnsforward/dnsrewrite_test.go |
require.NoError(t, err)
| <mask> res := makeRes(dns.RcodeSuccess, dns.TypeHTTPS, svcbVal)
<mask> d := &proxy.DNSContext{}
<mask>
<mask> err := srv.filterDNSRewrite(req, res, d)
<mask> require.Nil(t, err)
<mask> assert.Equal(t, dns.RcodeSuccess, d.Res.Rcode)
<mask>
<mask> require.Len(t, d.Res.Answer, 1)
<mask> ans, ok := d.Res.Answer[0].(*dns.HTTPS)
<mask>
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/dnsforward/dnsrewrite_test.go |
require.NoError(t, err)
| <mask> res := makeRes(dns.RcodeSuccess, dns.TypeSRV, srvVal)
<mask> d := &proxy.DNSContext{}
<mask>
<mask> err := srv.filterDNSRewrite(req, res, d)
<mask> require.Nil(t, err)
<mask> assert.Equal(t, dns.RcodeSuccess, d.Res.Rcode)
<mask>
<mask> require.Len(t, d.Res.Answer, 1)
<mask> ans, ok := d.Res.Answer[0].(*dns.SRV)
<mask>
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/dnsforward/dnsrewrite_test.go |
"github.com/AdguardTeam/golibs/testutil" | <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghnet"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/filtering"
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
<mask>
<mask> // fakeSystemResolvers is a mock aghnet.SystemResolvers implementation for
<mask> // tests.
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove "github.com/stretchr/testify/require"
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/dnsforward/http_test.go |
testutil.CleanupAndRequireSuccess(t, f.Close) | <mask>
<mask> var f *os.File
<mask> f, err := os.Open(filepath.Join("testdata", casesFileName))
<mask> require.NoError(t, err)
<mask> t.Cleanup(func() {
<mask> require.NoError(t, f.Close())
<mask> })
<mask>
<mask> err = json.NewDecoder(f).Decode(cases)
<mask> require.NoError(t, err)
<mask> }
<mask>
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, err)
t.Cleanup(func() {
assert.Nil(t, f.Close())
})
</s> add require.NoError(t, err)
testutil.CleanupAndRequireSuccess(t, f.Close) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove t.Cleanup(func() {
s.Close()
})
</s> add t.Cleanup(s.Close) </s> remove t.Cleanup(func() {
assert.NoError(t, os.Remove(dbFilename))
})
</s> add testutil.CleanupAndRequireSuccess(t, func() (err error) { return os.Remove(dbFilename) }) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/dnsforward/http_test.go |
require.NoError(t, s.Start())
testutil.CleanupAndRequireSuccess(t, s.Stop) | <mask> }
<mask> s := createTestServer(t, filterConf, forwardConf, nil)
<mask> s.sysResolvers = &fakeSystemResolvers{}
<mask>
<mask> require.Nil(t, s.Start())
<mask> t.Cleanup(func() {
<mask> require.Nil(t, s.Stop())
<mask> })
<mask>
<mask> defaultConf := s.conf
<mask>
<mask> w := httptest.NewRecorder()
<mask>
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove assert.Nil(t, err)
t.Cleanup(func() {
assert.Nil(t, s.Stop())
})
</s> add assert.NoError(t, err)
testutil.CleanupAndRequireSuccess(t, s.Stop) </s> remove t.Cleanup(func() {
s.conf = defaultConf
})
</s> add t.Cleanup(func() { s.conf = defaultConf }) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/dnsforward/http_test.go |
assert.NoError(t, err)
testutil.CleanupAndRequireSuccess(t, s.Stop) | <mask>
<mask> defaultConf := s.conf
<mask>
<mask> err := s.Start()
<mask> assert.Nil(t, err)
<mask> t.Cleanup(func() {
<mask> assert.Nil(t, s.Stop())
<mask> })
<mask>
<mask> w := httptest.NewRecorder()
<mask>
<mask> testCases := []struct {
<mask> name string
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, s.Start())
t.Cleanup(func() {
require.Nil(t, s.Stop())
})
</s> add require.NoError(t, s.Start())
testutil.CleanupAndRequireSuccess(t, s.Stop) </s> remove want error
name string
n int64
</s> add wantErrMsg string
name string
n int64 </s> remove t.Cleanup(func() {
s.conf = defaultConf
})
</s> add t.Cleanup(func() { s.conf = defaultConf }) </s> remove t.Cleanup(func() {
s.Close()
})
</s> add t.Cleanup(s.Close) </s> remove testCases := []struct {
err error
name string
want string
}{{
err: &LimitReachedError{
Limit: 0,
},
name: "simplest",
want: "attempted to read more than 0 bytes",
}}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
assert.Equal(t, tc.want, tc.err.Error())
})
}
</s> add testutil.AssertErrorMsg(t, "attempted to read more than 0 bytes", &LimitReachedError{
Limit: 0,
}) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/dnsforward/http_test.go |
t.Cleanup(func() { s.conf = defaultConf }) | <mask> caseData, ok := data[tc.name]
<mask> require.True(t, ok)
<mask>
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> t.Cleanup(func() {
<mask> s.conf = defaultConf
<mask> })
<mask>
<mask> rBody := io.NopCloser(bytes.NewReader(caseData.Req))
<mask> var r *http.Request
<mask> r, err = http.NewRequest(http.MethodPost, "http://example.com", rBody)
<mask> require.Nil(t, err)
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove assert.Nil(t, err)
t.Cleanup(func() {
assert.Nil(t, s.Stop())
})
</s> add assert.NoError(t, err)
testutil.CleanupAndRequireSuccess(t, s.Stop) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, werr)
</s> add require.NoError(t, werr) </s> remove require.Nil(t, s.Start())
t.Cleanup(func() {
require.Nil(t, s.Stop())
})
</s> add require.NoError(t, s.Start())
testutil.CleanupAndRequireSuccess(t, s.Stop) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/dnsforward/http_test.go |
require.NoError(t, err) | <mask>
<mask> rBody := io.NopCloser(bytes.NewReader(caseData.Req))
<mask> var r *http.Request
<mask> r, err = http.NewRequest(http.MethodPost, "http://example.com", rBody)
<mask> require.Nil(t, err)
<mask>
<mask> s.handleSetConfig(w, r)
<mask> assert.Equal(t, tc.wantSet, strings.TrimSuffix(w.Body.String(), "\n"))
<mask> w.Body.Reset()
<mask>
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove t.Cleanup(func() {
s.conf = defaultConf
})
</s> add t.Cleanup(func() { s.conf = defaultConf }) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove r, err := newIPRange(tc.start, tc.end)
if tc.wantErrMsg == "" {
assert.NoError(t, err)
assert.NotNil(t, r)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add _, err := newIPRange(tc.start, tc.end)
testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/dnsforward/http_test.go |
require.NoError(t, err) | <mask> wantStatResult: stats.RParental,
<mask> }}
<mask>
<mask> ups, err := upstream.AddressToUpstream("1.1.1.1", nil)
<mask> require.Nil(t, err)
<mask>
<mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> req := &dns.Msg{
<mask> Question: []dns.Question{{
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove readCloser := io.NopCloser(strings.NewReader(tc.rStr))
</s> add </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove assert.Equal(t, tc.want, err)
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove r, err := newIPRange(tc.start, tc.end)
if tc.wantErrMsg == "" {
assert.NoError(t, err)
assert.NotNil(t, r)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add _, err := newIPRange(tc.start, tc.end)
testutil.AssertErrorMsg(t, tc.wantErrMsg, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/dnsforward/stats_test.go |
"github.com/AdguardTeam/golibs/testutil" | <mask> "testing"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghtest"
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
<mask>
<mask> func TestMain(m *testing.M) {
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/home/auth_test.go |
require.NoError(t, err) | <mask>
<mask> func TestNewSessionToken(t *testing.T) {
<mask> // Successful case.
<mask> token, err := newSessionToken()
<mask> require.Nil(t, err)
<mask> assert.Len(t, token, sessionTokenSize)
<mask>
<mask> // Break the rand.Reader.
<mask> prevReader := rand.Reader
<mask> t.Cleanup(func() {
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove t.Cleanup(func() {
rand.Reader = prevReader
})
</s> add t.Cleanup(func() { rand.Reader = prevReader }) </s> remove require.NotNil(t, err)
</s> add require.Error(t, err) </s> remove t.Cleanup(func() {
assert.Nil(t, file.Close())
})
</s> add testutil.CleanupAndRequireSuccess(t, file.Close) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/home/auth_test.go |
t.Cleanup(func() { rand.Reader = prevReader }) | <mask> assert.Len(t, token, sessionTokenSize)
<mask>
<mask> // Break the rand.Reader.
<mask> prevReader := rand.Reader
<mask> t.Cleanup(func() {
<mask> rand.Reader = prevReader
<mask> })
<mask> rand.Reader = &bytes.Buffer{}
<mask>
<mask> // Unsuccessful case.
<mask> token, err = newSessionToken()
<mask> require.NotNil(t, err)
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.NotNil(t, err)
</s> add require.Error(t, err) </s> remove assert.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/home/auth_test.go |
require.Error(t, err) | <mask> rand.Reader = &bytes.Buffer{}
<mask>
<mask> // Unsuccessful case.
<mask> token, err = newSessionToken()
<mask> require.NotNil(t, err)
<mask> assert.Empty(t, token)
<mask> }
<mask>
<mask> func TestAuth(t *testing.T) {
<mask> dir := t.TempDir()
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove t.Cleanup(func() {
rand.Reader = prevReader
})
</s> add t.Cleanup(func() { rand.Reader = prevReader }) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove t.Cleanup(func() {
GLMode = false
})
</s> add t.Cleanup(func() { GLMode = false }) </s> remove assert.Nil(t, err)
</s> add require.NoError(t, err) </s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/home/auth_test.go |
require.NoError(t, err) | <mask> assert.Equal(t, checkSessionNotFound, a.checkSession("notfound"))
<mask> a.RemoveSession("notfound")
<mask>
<mask> sess, err := newSessionToken()
<mask> assert.Nil(t, err)
<mask> sessStr := hex.EncodeToString(sess)
<mask>
<mask> now := time.Now().UTC().Unix()
<mask> // check expiration
<mask> s.expire = uint32(now)
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove assert.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.NotNil(t, err)
</s> add require.Error(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/home/auth_test.go |
require.NoError(t, err) | <mask> assert.True(t, handlerCalled)
<mask>
<mask> // perform login
<mask> cookie, err := Context.auth.httpCookie(loginJSON{Name: "name", Password: "password"}, "")
<mask> assert.Nil(t, err)
<mask> assert.NotEmpty(t, cookie)
<mask>
<mask> // get /
<mask> handler2 = optionalAuth(handler)
<mask> w.hdr = make(http.Header)
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.NotNil(t, err)
</s> add require.Error(t, err)
</s> remove assert.Nil(t, err)
</s> add require.NoError(t, err) </s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/home/auth_test.go |
testutil.AssertErrorMsg(t, tc.wantErrMsg, err) | <mask>
<mask> ip, err := realIP(r)
<mask> assert.Equal(t, tc.wantIP, ip)
<mask>
<mask> if tc.wantErrMsg == "" {
<mask> assert.NoError(t, err)
<mask> } else {
<mask> require.Error(t, err)
<mask> assert.Equal(t, tc.wantErrMsg, err.Error())
<mask> }
<mask> })
<mask> }
<mask> }
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove if tc.wantErrMsg == "" {
assert.NoError(t, err)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove if tc.wantErrMsg == "" {
assert.NoError(t, err)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove if tc.wantErrMsg == "" {
assert.NoError(t, err)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove if tc.wantErrMsg == "" {
assert.NoError(t, err)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove if tc.wantErrMsg == "" {
assert.NoError(t, err)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/home/auth_test.go |
t.Cleanup(func() { GLMode = false }) | <mask> func TestAuthGL(t *testing.T) {
<mask> dir := t.TempDir()
<mask>
<mask> GLMode = true
<mask> t.Cleanup(func() {
<mask> GLMode = false
<mask> })
<mask> glFilePrefix = dir + "/gl_token_"
<mask>
<mask> data := make([]byte, 4)
<mask> aghos.NativeEndian.PutUint32(data, 1)
<mask>
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, os.WriteFile(glFilePrefix+"test", data, 0o644))
</s> add require.NoError(t, os.WriteFile(glFilePrefix+"test", data, 0o644)) </s> remove require.NotNil(t, err)
</s> add require.Error(t, err) </s> remove require.Nil(t, os.WriteFile(glFilePrefix+"test", data, 0o644))
</s> add require.NoError(t, os.WriteFile(glFilePrefix+"test", data, 0o644)) </s> remove assert.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
t.Cleanup(func() {
assert.Nil(t, f.Close())
})
</s> add require.NoError(t, err)
testutil.CleanupAndRequireSuccess(t, f.Close) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/home/authglinet_test.go |
require.NoError(t, os.WriteFile(glFilePrefix+"test", data, 0o644)) | <mask>
<mask> data := make([]byte, 4)
<mask> aghos.NativeEndian.PutUint32(data, 1)
<mask>
<mask> require.Nil(t, os.WriteFile(glFilePrefix+"test", data, 0o644))
<mask> assert.False(t, glCheckToken("test"))
<mask>
<mask> data = make([]byte, 4)
<mask> aghos.NativeEndian.PutUint32(data, uint32(time.Now().UTC().Unix()+60))
<mask>
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, os.WriteFile(glFilePrefix+"test", data, 0o644))
</s> add require.NoError(t, os.WriteFile(glFilePrefix+"test", data, 0o644)) </s> remove t.Cleanup(func() {
GLMode = false
})
</s> add t.Cleanup(func() { GLMode = false }) </s> remove require.Nil(t, err)
t.Cleanup(func() {
assert.Nil(t, f.Close())
})
</s> add require.NoError(t, err)
testutil.CleanupAndRequireSuccess(t, f.Close) </s> remove readCloser := io.NopCloser(strings.NewReader(tc.rStr))
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/home/authglinet_test.go |
require.NoError(t, os.WriteFile(glFilePrefix+"test", data, 0o644)) | <mask>
<mask> data = make([]byte, 4)
<mask> aghos.NativeEndian.PutUint32(data, uint32(time.Now().UTC().Unix()+60))
<mask>
<mask> require.Nil(t, os.WriteFile(glFilePrefix+"test", data, 0o644))
<mask> r, _ := http.NewRequest(http.MethodGet, "http://localhost/", nil)
<mask> r.AddCookie(&http.Cookie{Name: glCookieName, Value: "test"})
<mask> assert.True(t, glProcessCookie(r))
<mask> }
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, os.WriteFile(glFilePrefix+"test", data, 0o644))
</s> add require.NoError(t, os.WriteFile(glFilePrefix+"test", data, 0o644)) </s> remove t.Cleanup(func() {
GLMode = false
})
</s> add t.Cleanup(func() { GLMode = false }) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, s.Start())
t.Cleanup(func() {
require.Nil(t, s.Stop())
})
</s> add require.NoError(t, s.Start())
testutil.CleanupAndRequireSuccess(t, s.Stop) </s> remove assert.Nil(t, os.WriteFile(filepath.Join(wd, "AdGuardHome"), []byte("AdGuardHome"), 0o755))
assert.Nil(t, os.WriteFile(filepath.Join(wd, "README.md"), []byte("README.md"), 0o644))
assert.Nil(t, os.WriteFile(filepath.Join(wd, "LICENSE.txt"), []byte("LICENSE.txt"), 0o644))
assert.Nil(t, os.WriteFile(filepath.Join(wd, "AdGuardHome.yaml"), []byte("AdGuardHome.yaml"), 0o644))
</s> add require.NoError(t, os.WriteFile(filepath.Join(wd, "AdGuardHome"), []byte("AdGuardHome"), 0o755))
require.NoError(t, os.WriteFile(filepath.Join(wd, "README.md"), []byte("README.md"), 0o644))
require.NoError(t, os.WriteFile(filepath.Join(wd, "LICENSE.txt"), []byte("LICENSE.txt"), 0o644))
require.NoError(t, os.WriteFile(filepath.Join(wd, "AdGuardHome.yaml"), []byte("AdGuardHome.yaml"), 0o644)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/home/authglinet_test.go |
// TODO(e.burkov): leases.db isn't created on Windows so removing it
// causes an error. Split the test to make it run properly on different
// operating systems. | <mask> }
<mask>
<mask> clients.dhcpServer, err = dhcpd.Create(config)
<mask> require.NoError(t, err)
<mask>
<mask> t.Cleanup(func() { _ = os.Remove("leases.db") })
<mask>
<mask> err = clients.dhcpServer.AddStaticLease(&dhcpd.Lease{
<mask> HWAddr: net.HardwareAddr{0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA},
<mask> IP: ip,
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove t.Cleanup(func() {
assert.NoError(t, os.Remove(dbFilename))
})
</s> add testutil.CleanupAndRequireSuccess(t, func() (err error) { return os.Remove(dbFilename) }) </s> remove t.Cleanup(func() {
require.NoError(t, f.Close())
})
</s> add testutil.CleanupAndRequireSuccess(t, f.Close) </s> remove require.Nil(t, err)
t.Cleanup(func() {
assert.Nil(t, file.Close())
})
</s> add require.NoError(t, err)
testutil.CleanupAndRequireSuccess(t, file.Close) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
t.Cleanup(func() {
assert.Nil(t, f.Close())
})
</s> add require.NoError(t, err)
testutil.CleanupAndRequireSuccess(t, f.Close) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/home/clients_test.go |
// Add a new client with the IP from the first client's IP range. | <mask> })
<mask> require.NoError(t, err)
<mask> assert.True(t, ok)
<mask>
<mask> // Add a new client with the IP from the first client's IP
<mask> // range.
<mask> ok, err = clients.Add(&Client{
<mask> IDs: []string{"2.2.2.2"},
<mask> Name: "client3",
<mask> })
<mask> require.NoError(t, err)
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/home/clients_test.go |
"github.com/AdguardTeam/golibs/testutil" | <mask> "testing"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/golibs/netutil"
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
<mask>
<mask> const testFltsFileName = "1.txt"
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/home/filter_test.go |
h := http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { | <mask>
<mask> func testStartFilterListener(t *testing.T, fltContent *[]byte) (l net.Listener) {
<mask> t.Helper()
<mask>
<mask> h := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
<mask> n, werr := w.Write(*fltContent)
<mask> require.NoError(t, werr)
<mask> require.Equal(t, len(*fltContent), n)
<mask> })
<mask>
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, werr)
</s> add require.NoError(t, werr) </s> remove lreader, err := LimitReader(readCloser, tc.limit)
require.NoError(t, err)
n, err := lreader.Read(buf)
require.Equal(t, tc.err, err)
</s> add </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.NotNilf(t, err, "expected an error because %s but no error returned", descr)
</s> add require.Error(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/home/filter_test.go |
testutil.CleanupAndRequireSuccess(t, l.Close) | <mask>
<mask> go func() {
<mask> _ = http.Serve(l, h)
<mask> }()
<mask> t.Cleanup(func() {
<mask> require.NoError(t, l.Close())
<mask> })
<mask>
<mask> return l
<mask> }
<mask>
<mask> func TestFilters(t *testing.T) {
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove t.Cleanup(func() {
assert.NoError(t, os.Remove(dbFilename))
})
</s> add testutil.CleanupAndRequireSuccess(t, func() (err error) { return os.Remove(dbFilename) }) </s> remove require.Nil(t, err)
t.Cleanup(func() {
assert.Nil(t, file.Close())
})
</s> add require.NoError(t, err)
testutil.CleanupAndRequireSuccess(t, file.Close) </s> remove t.Cleanup(func() {
assert.Nil(t, reader.Close())
})
</s> add testutil.CleanupAndRequireSuccess(t, reader.Close) </s> remove require.Nil(t, err)
t.Cleanup(func() {
</s> add require.NoError(t, err)
testutil.CleanupAndRequireSuccess(t, func() (err error) { </s> remove t.Cleanup(func() {
assert.Nil(t, file.Close())
})
</s> add testutil.CleanupAndRequireSuccess(t, file.Close) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/home/filter_test.go |
t.Cleanup(func() { fltContent = []byte(content) }) | <mask> })
<mask>
<mask> t.Run("refresh_actually", func(t *testing.T) {
<mask> fltContent = []byte(`||example.com^`)
<mask> t.Cleanup(func() {
<mask> fltContent = []byte(content)
<mask> })
<mask>
<mask> updateAndAssert(t, require.True, 1)
<mask> })
<mask>
<mask> t.Run("load_unload", func(t *testing.T) {
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove t.Cleanup(func() {
GLMode = false
})
</s> add t.Cleanup(func() { GLMode = false }) </s> remove h := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
</s> add h := http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { </s> remove t.Cleanup(func() {
s.conf = defaultConf
})
</s> add t.Cleanup(func() { s.conf = defaultConf }) </s> remove t.Cleanup(func() {
s.Close()
})
</s> add t.Cleanup(s.Close) </s> remove assert.Equal(t, tc.want, err)
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/home/filter_test.go |
require.NoError(t, werr) | <mask> return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
<mask> var b []byte
<mask> b, *err = io.ReadAll(r.Body)
<mask> _, werr := w.Write(b)
<mask> require.Nil(t, werr)
<mask> })
<mask> }
<mask>
<mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove h := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
</s> add h := http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { </s> remove assert.Equal(t, tc.want, err)
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove readCloser := io.NopCloser(strings.NewReader(tc.rStr))
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/home/middlewares_test.go |
require.NoError(t, err) | <mask> func testParseOK(t *testing.T, ss ...string) options {
<mask> t.Helper()
<mask>
<mask> o, _, err := parse("", ss)
<mask> require.Nil(t, err)
<mask>
<mask> return o
<mask> }
<mask>
<mask> func testParseErr(t *testing.T, descr string, ss ...string) {
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.NotNilf(t, err, "expected an error because %s but no error returned", descr)
</s> add require.Error(t, err) </s> remove require.Nil(t, err)
t.Cleanup(func() {
assert.Nil(t, f.Close())
})
</s> add require.NoError(t, err)
testutil.CleanupAndRequireSuccess(t, f.Close) </s> remove h := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
</s> add h := http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { </s> remove require.Error(t, err)
assert.Equal(t, "unexpected type of dns: int", err.Error())
</s> add testutil.AssertErrorMsg(t, "unexpected type of dns: int", err) </s> remove require.Nil(t, err)
t.Cleanup(func() {
assert.Nil(t, file.Close())
})
</s> add require.NoError(t, err)
testutil.CleanupAndRequireSuccess(t, file.Close) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/home/options_test.go |
require.Error(t, err) | <mask> func testParseErr(t *testing.T, descr string, ss ...string) {
<mask> t.Helper()
<mask>
<mask> _, _, err := parse("", ss)
<mask> require.NotNilf(t, err, "expected an error because %s but no error returned", descr)
<mask> }
<mask>
<mask> func testParseParamMissing(t *testing.T, param string) {
<mask> t.Helper()
<mask>
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
t.Cleanup(func() {
assert.Nil(t, f.Close())
})
</s> add require.NoError(t, err)
testutil.CleanupAndRequireSuccess(t, f.Close) </s> remove h := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
</s> add h := http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { </s> remove t.Cleanup(func() {
serr := s.Stop()
require.NoErrorf(t, serr, "dns server failed to stop: %s", serr)
})
</s> add testutil.CleanupAndRequireSuccess(t, s.Stop) </s> remove // Error implements error interface for LimitReachedError.
</s> add // Error implements the error interface for LimitReachedError. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/home/options_test.go |
"github.com/AdguardTeam/golibs/testutil" | <mask> import (
<mask> "testing"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/golibs/timeutil"
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove "fmt"
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/home/upgrade_test.go |
testutil.AssertErrorMsg(t, tc.wantErr, err) | <mask> t.Run(tc.name, func(t *testing.T) {
<mask> err := upgradeSchema9to10(conf)
<mask>
<mask> if tc.wantErr != "" {
<mask> require.Error(t, err)
<mask> assert.Equal(t, tc.wantErr, err.Error())
<mask>
<mask> return
<mask> }
<mask>
<mask> require.NoError(t, err)
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove if tc.wantErrMsg == "" {
assert.NoError(t, err)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove if tc.wantErrMsg == "" {
assert.NoError(t, err)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove if tc.wantErrMsg == "" {
assert.NoError(t, err)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove r, err := newIPRange(tc.start, tc.end)
if tc.wantErrMsg == "" {
assert.NoError(t, err)
assert.NotNil(t, r)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add _, err := newIPRange(tc.start, tc.end)
testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove if tc.wantErrMsg == "" {
assert.NoError(t, err)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/home/upgrade_test.go |
testutil.AssertErrorMsg(t, "unexpected type of dns: int", err) | <mask> err := upgradeSchema9to10(yobj{
<mask> "dns": ultimateAns,
<mask> })
<mask>
<mask> require.Error(t, err)
<mask> assert.Equal(t, "unexpected type of dns: int", err.Error())
<mask> })
<mask> }
<mask>
<mask> func TestUpgradeSchema10to11(t *testing.T) {
<mask> check := func(t *testing.T, conf yobj) {
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Error(t, err)
assert.Equal(t, "unexpected type of dns: int", err.Error())
</s> add testutil.AssertErrorMsg(t, "unexpected type of dns: int", err) </s> remove assert.True(t, strings.Contains(err.Error(), "peer is of unexpected type"))
</s> add testutil.AssertErrorMsg(t, "peer is of unexpected type *dhcpd.unexpectedAddrType", err) </s> remove if tc.wantErrMsg == "" {
assert.NoError(t, err)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove r, err := newIPRange(tc.start, tc.end)
if tc.wantErrMsg == "" {
assert.NoError(t, err)
assert.NotNil(t, r)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add _, err := newIPRange(tc.start, tc.end)
testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove require.Error(t, err)
assert.Equal(t, tc.wantErr, err.Error())
</s> add testutil.AssertErrorMsg(t, tc.wantErr, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/home/upgrade_test.go |
testutil.AssertErrorMsg(t, "unexpected type of dns: int", err) | <mask> err := upgradeSchema11to12(yobj{
<mask> "dns": 0,
<mask> })
<mask>
<mask> require.Error(t, err)
<mask> assert.Equal(t, "unexpected type of dns: int", err.Error())
<mask> })
<mask>
<mask> t.Run("no_field", func(t *testing.T) {
<mask> conf := yobj{
<mask> "dns": yobj{},
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Error(t, err)
assert.Equal(t, "unexpected type of dns: int", err.Error())
</s> add testutil.AssertErrorMsg(t, "unexpected type of dns: int", err) </s> remove assert.True(t, strings.Contains(err.Error(), "peer is of unexpected type"))
</s> add testutil.AssertErrorMsg(t, "peer is of unexpected type *dhcpd.unexpectedAddrType", err) </s> remove require.Error(t, err)
assert.Equal(t, tc.wantErr, err.Error())
</s> add testutil.AssertErrorMsg(t, tc.wantErr, err) </s> remove if tc.wantErrMsg == "" {
assert.NoError(t, err)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove if tc.wantErrMsg == "" {
assert.NoError(t, err)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/home/upgrade_test.go |
"github.com/stretchr/testify/require" | <mask> "github.com/miekg/dns"
<mask> "github.com/stretchr/testify/assert"
<mask> )
<mask>
<mask> func TestDecodeLogEntry(t *testing.T) {
<mask> logOutput := &bytes.Buffer{}
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/querylog/decode_test.go |
require.NoError(t, err) | <mask> `"DNSRewriteResult":{"RCode":0,"Response":{"1":["127.0.0.2"]}}},` +
<mask> `"Elapsed":837429}`
<mask>
<mask> ans, err := base64.StdEncoding.DecodeString(ansStr)
<mask> assert.Nil(t, err)
<mask>
<mask> want := &logEntry{
<mask> IP: net.IPv4(127, 0, 0, 1),
<mask> Time: time.Date(2020, 11, 25, 15, 55, 56, 519796000, time.UTC),
<mask> QHost: "an.yandex.ru",
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/querylog/decode_test.go |
require.NoError(t, l.flushLogBuffer(true)) | <mask>
<mask> // Add disk entries.
<mask> addEntry(l, "example.org", net.IPv4(1, 1, 1, 1), net.IPv4(2, 2, 2, 1))
<mask> // Write to disk (first file).
<mask> require.Nil(t, l.flushLogBuffer(true))
<mask> // Start writing to the second file.
<mask> require.Nil(t, l.rotate())
<mask> // Add disk entries.
<mask> addEntry(l, "example.org", net.IPv4(1, 1, 1, 2), net.IPv4(2, 2, 2, 2))
<mask> // Write to disk.
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, l.rotate())
</s> add require.NoError(t, l.rotate()) </s> remove require.Nil(t, l.flushLogBuffer(true))
</s> add require.NoError(t, l.flushLogBuffer(true)) </s> remove require.Nil(t, l.flushLogBuffer(true))
</s> add require.NoError(t, l.flushLogBuffer(true)) </s> remove require.Nil(t, l.flushLogBuffer(true))
</s> add require.NoError(t, l.flushLogBuffer(true)) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/querylog/qlog_test.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.