mirror of
https://github.com/golang/go.git
synced 2025-11-10 05:31:03 +00:00
net: change type of dnsConfig.timeout from int to time.Duration
Instead of keeping the desired number of seconds and converting to time.Duration for every query, convert to time.Duration when building the config. Updates #15473 Change-Id: Ib24c050b593b3109011e359f4ed837a3fb45dc65 Reviewed-on: https://go-review.googlesource.com/22548 Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
This commit is contained in:
parent
22db3c5a62
commit
9faf5cdf9d
3 changed files with 19 additions and 20 deletions
|
|
@ -24,7 +24,7 @@ var dnsReadConfigTests = []struct {
|
|||
servers: []string{"8.8.8.8", "2001:4860:4860::8888", "fe80::1%lo0"},
|
||||
search: []string{"localdomain"},
|
||||
ndots: 5,
|
||||
timeout: 10,
|
||||
timeout: 10 * time.Second,
|
||||
attempts: 3,
|
||||
rotate: true,
|
||||
unknownOpt: true, // the "options attempts 3" line
|
||||
|
|
@ -36,7 +36,7 @@ var dnsReadConfigTests = []struct {
|
|||
servers: []string{"8.8.8.8"},
|
||||
search: []string{"localdomain"},
|
||||
ndots: 1,
|
||||
timeout: 5,
|
||||
timeout: 5 * time.Second,
|
||||
attempts: 2,
|
||||
},
|
||||
},
|
||||
|
|
@ -46,7 +46,7 @@ var dnsReadConfigTests = []struct {
|
|||
servers: []string{"8.8.8.8"},
|
||||
search: []string{"test", "invalid"},
|
||||
ndots: 1,
|
||||
timeout: 5,
|
||||
timeout: 5 * time.Second,
|
||||
attempts: 2,
|
||||
},
|
||||
},
|
||||
|
|
@ -55,7 +55,7 @@ var dnsReadConfigTests = []struct {
|
|||
want: &dnsConfig{
|
||||
servers: defaultNS,
|
||||
ndots: 1,
|
||||
timeout: 5,
|
||||
timeout: 5 * time.Second,
|
||||
attempts: 2,
|
||||
search: []string{"domain.local"},
|
||||
},
|
||||
|
|
@ -64,7 +64,7 @@ var dnsReadConfigTests = []struct {
|
|||
name: "testdata/openbsd-resolv.conf",
|
||||
want: &dnsConfig{
|
||||
ndots: 1,
|
||||
timeout: 5,
|
||||
timeout: 5 * time.Second,
|
||||
attempts: 2,
|
||||
lookup: []string{"file", "bind"},
|
||||
servers: []string{"169.254.169.254", "10.240.0.1"},
|
||||
|
|
@ -103,7 +103,7 @@ func TestDNSReadMissingFile(t *testing.T) {
|
|||
want := &dnsConfig{
|
||||
servers: defaultNS,
|
||||
ndots: 1,
|
||||
timeout: 5,
|
||||
timeout: 5 * time.Second,
|
||||
attempts: 2,
|
||||
search: []string{"domain.local"},
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue