diff options
| author | Ian Lance Taylor <iant@golang.org> | 2019-01-11 14:26:24 -0800 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2019-01-14 20:18:42 +0000 |
| commit | cbf9140f8983380d3384d77fcf6b90c928af9c24 (patch) | |
| tree | 7feb55e02614a39cf2eae4bf6a1510aa488e9ce3 | |
| parent | e39e43d7349555501080133bb426f1ead4b3ef97 (diff) | |
| download | go-cbf9140f8983380d3384d77fcf6b90c928af9c24.tar.gz go-cbf9140f8983380d3384d77fcf6b90c928af9c24.zip | |
[release-branch.go1.11] net: pass if at least one matching entry in TestLookupGmailTXT
Updates #29698
Fixes #29700
Change-Id: I0531c0a274b120af8871aa2f5975744ff6c912a3
Reviewed-on: https://go-review.googlesource.com/c/157638
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
(cherry picked from commit 7cbfa55b5d17c8deaecff05e4221f828467cfa97)
Reviewed-on: https://go-review.googlesource.com/c/157639
| -rw-r--r-- | src/net/lookup_test.go | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/net/lookup_test.go b/src/net/lookup_test.go index 5c66dfa260..f2adbc18c5 100644 --- a/src/net/lookup_test.go +++ b/src/net/lookup_test.go @@ -237,11 +237,16 @@ func TestLookupGmailTXT(t *testing.T) { if len(txts) == 0 { t.Error("got no record") } + found := false for _, txt := range txts { - if !strings.Contains(txt, tt.txt) || (!strings.HasSuffix(txt, tt.host) && !strings.HasSuffix(txt, tt.host+".")) { - t.Errorf("got %s; want a record containing %s, %s", txt, tt.txt, tt.host) + if strings.Contains(txt, tt.txt) && (strings.HasSuffix(txt, tt.host) || strings.HasSuffix(txt, tt.host+".")) { + found = true + break } } + if !found { + t.Errorf("got %v; want a record containing %s, %s", txts, tt.txt, tt.host) + } } } |