Merge pull request #158 from wjdp/flaky-test

Fix flaky test (TestAnchorExternalHrefIPTimeout)
wjdp · Jan 15, 2021 · 0dfa159 · 0dfa159
2 parents 22b5824 + a65ff20
commit 0dfa159
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/htmltest/check-link.go b/htmltest/check-link.go
@@ -182,18 +182,6 @@ func (hT *HTMLTest) checkExternal(ref *htmldoc.Reference) {
 		<-hT.httpChannel // Bump off http concurrency limiter
 
 		if err != nil {
-			if strings.Contains(err.Error(), "dial tcp") {
-				// Remove long prefix
-				prefix := "Get " + urlStr + ": dial tcp: lookup "
-				cleanedMessage := strings.TrimPrefix(err.Error(), prefix)
-				// Add error
-				hT.issueStore.AddIssue(issues.Issue{
-					Level:     issueLevel,
-					Message:   cleanedMessage,
-					Reference: ref,
-				})
-				return
-			}
 			if strings.Contains(err.Error(), "Client.Timeout") {
 				hT.issueStore.AddIssue(issues.Issue{
 					Level:     issueLevel,
@@ -215,6 +203,20 @@ func (hT *HTMLTest) checkExternal(ref *htmldoc.Reference) {
 				}
 			}
 
+			// More generic, should be kept below more specific cases
+			if strings.Contains(err.Error(), "dial tcp") {
+				// Remove long prefix
+				prefix := "Get " + urlStr + ": dial tcp: lookup "
+				cleanedMessage := strings.TrimPrefix(err.Error(), prefix)
+				// Add error
+				hT.issueStore.AddIssue(issues.Issue{
+					Level:     issueLevel,
+					Message:   cleanedMessage,
+					Reference: ref,
+				})
+				return
+			}
+
 			// Unhandled client error, return generic error
 			hT.issueStore.AddIssue(issues.Issue{
 				Level:     issueLevel,

diff --git a/htmltest/test_helpers_test.go b/htmltest/test_helpers_test.go
@@ -20,7 +20,7 @@ func tExpectIssue(t *testing.T, hT *HTMLTest, message string, expected int) {
 	c := hT.issueStore.MessageMatchCount(message)
 	if c != expected {
 		hT.issueStore.DumpIssues(true)
-		t.Error("expected issue", message, "count", expected, "!=", c)
+		t.Error("expected issue", "'"+message+"'", "count", expected, "!=", c)
 	}
 }