[release-branch.go1.11] net: fix test after 8.8.8.8 changed its reverse DNS name

Google's 8.8.8.8 DNS server used to reports its reverse DNS name
as ending in ".google.com". Now it's "dns.google.".

Change-Id: I7dd15f03239e5c3f202e471618ab867690cb4f9d
Reviewed-on: https://go-review.googlesource.com/c/go/+/169679
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
(cherry picked from commit 3089d189569ed272eaf2bc6c4330e848a46e9999)
Reviewed-on: https://go-review.googlesource.com/c/go/+/169718

diff --git a/src/net/lookup_test.go b/src/net/lookup_test.go
index f2adbc18c5a790efd052b56a6e637f94cba3f61e..a2e3318c8d9260300b84e1af57d86468475fd2c2 100644 (file)
--- a/src/net/lookup_test.go
+++ b/src/net/lookup_test.go
@@ -250,14 +250,11 @@ func TestLookupGmailTXT(t *testing.T) {
        }
 }
 
-var lookupGooglePublicDNSAddrTests = []struct {
-       addr, name string
-}{
-       {"8.8.8.8", ".google.com."},
-       {"8.8.4.4", ".google.com."},
-
-       {"2001:4860:4860::8888", ".google.com."},
-       {"2001:4860:4860::8844", ".google.com."},
+var lookupGooglePublicDNSAddrTests = []string{
+       "8.8.8.8",
+       "8.8.4.4",
+       "2001:4860:4860::8888",
+       "2001:4860:4860::8844",
 }
 
 func TestLookupGooglePublicDNSAddr(t *testing.T) {
@@ -269,8 +266,8 @@ func TestLookupGooglePublicDNSAddr(t *testing.T) {
 
        defer dnsWaitGroup.Wait()
 
-       for _, tt := range lookupGooglePublicDNSAddrTests {
-               names, err := LookupAddr(tt.addr)
+       for _, ip := range lookupGooglePublicDNSAddrTests {
+               names, err := LookupAddr(ip)
                if err != nil {
                        t.Fatal(err)
                }
@@ -278,8 +275,8 @@ func TestLookupGooglePublicDNSAddr(t *testing.T) {
                        t.Error("got no record")
                }
                for _, name := range names {
-                       if !strings.HasSuffix(name, tt.name) {
-                               t.Errorf("got %s; want a record containing %s", name, tt.name)
+                       if !strings.HasSuffix(name, ".google.com.") && !strings.HasSuffix(name, ".google.") {
+                               t.Errorf("got %q; want a record ending in .google.com. or .google.", name)
                        }
                }
        }
@@ -652,8 +649,8 @@ func testDots(t *testing.T, mode string) {
                t.Errorf("LookupAddr(8.8.8.8): %v (mode=%v)", err, mode)
        } else {
                for _, name := range names {
-                       if !strings.HasSuffix(name, ".google.com.") {
-                               t.Errorf("LookupAddr(8.8.8.8) = %v, want names ending in .google.com. with trailing dot (mode=%v)", names, mode)
+                       if !strings.HasSuffix(name, ".google.com.") && !strings.HasSuffix(name, ".google.") {
+                               t.Errorf("LookupAddr(8.8.8.8) = %v, want names ending in .google.com or .google with trailing dot (mode=%v)", names, mode)
                                break
                        }
                }