From: Ian Lance Taylor Date: Fri, 11 Jan 2019 22:26:24 +0000 (-0800) Subject: net: pass if at least one matching entry in TestLookupGmailTXT X-Git-Tag: go1.12rc1~81 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=7cbfa55b5d17c8deaecff05e4221f828467cfa97;p=gostls13.git net: pass if at least one matching entry in TestLookupGmailTXT Fixes #29698 Change-Id: I0531c0a274b120af8871aa2f5975744ff6c912a3 Reviewed-on: https://go-review.googlesource.com/c/157638 Run-TryBot: Ian Lance Taylor TryBot-Result: Gobot Gobot Reviewed-by: Brad Fitzpatrick --- diff --git a/src/net/lookup_test.go b/src/net/lookup_test.go index 1da0e49a28..6dc5f61728 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) + } } }