qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-18 00:14:47 -07:00
Code Releases Activity

net: fix failing TestGoLookupIPOrderFallbackToFile

Browse Source 
Change-Id: I17ef4e221e5cd0fb8dc553785248ccac59380c6f
Reviewed-on: https://go-review.googlesource.com/17321
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
This commit is contained in:
Benjamin Prosnitz 2015-12-02 11:02:04 +08:00 committed by Brad Fitzpatrick
parent d5e8f4dbb8
commit 723605e918
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/net/dnsclient_unix.go
View File

@ -476,7 +476,7 @@ func goLookupIPOrder(name string, order hostLookupOrder) (addrs []IPAddr, err er
if order == hostLookupDNSFiles {
addrs = goLookupIPFiles(name)
}
if lastErr != nil {
if len(addrs) == 0 && lastErr != nil {
return nil, lastErr
}
}

6
src/net/dnsclient_unix_test.go
View File

@ -413,7 +413,11 @@ func TestGoLookupIPOrderFallbackToFile(t *testing.T) {
t.Errorf("%s: expected to successfully lookup host entry", name)
continue
}
if got, want := addrs, []IPAddr{IPAddr{IP: IP{127, 0, 0, 1}}}; !reflect.DeepEqual(got, want) {
if len(addrs) != 1 {
t.Errorf("%s: expected exactly one result, but got %v", name, addrs)
continue
}
if got, want := addrs[0].String(), "127.1.1.1"; got != want {
t.Errorf("%s: address doesn't match expectation. got %v, want %v", name, got, want)
}
}