diff options
-rw-r--r-- | integrations/git_test.go | 11 | ||||
-rw-r--r-- | modules/markup/markdown/goldmark.go | 5 |
2 files changed, 10 insertions, 6 deletions
diff --git a/integrations/git_test.go b/integrations/git_test.go index f22b1cd9f2..d8e7c4fe51 100644 --- a/integrations/git_test.go +++ b/integrations/git_test.go @@ -518,7 +518,16 @@ func doEnsureDiffNoChange(ctx APITestContext, pr api.PullRequest, diffStr string return func(t *testing.T) { req := NewRequest(t, "GET", fmt.Sprintf("/%s/%s/pulls/%d.diff", url.PathEscape(ctx.Username), url.PathEscape(ctx.Reponame), pr.Index)) resp := ctx.Session.MakeRequest(t, req, http.StatusOK) - assert.Equal(t, diffStr, resp.Body.String()) + expectedMaxLen := len(diffStr) + if expectedMaxLen > 800 { + expectedMaxLen = 800 + } + actual := resp.Body.String() + actualMaxLen := len(actual) + if actualMaxLen > 800 { + actualMaxLen = 800 + } + assert.Equal(t, diffStr, actual, "Unexpected change in the diff string: expected: %s but was actually: %s", diffStr[:expectedMaxLen], actual[:actualMaxLen]) } } diff --git a/modules/markup/markdown/goldmark.go b/modules/markup/markdown/goldmark.go index 0b6ea222d9..07e2e36e1d 100644 --- a/modules/markup/markdown/goldmark.go +++ b/modules/markup/markdown/goldmark.go @@ -10,7 +10,6 @@ import ( "regexp" "strings" - "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/markup" "code.gitea.io/gitea/modules/markup/common" "code.gitea.io/gitea/modules/setting" @@ -139,10 +138,6 @@ func (g *ASTTransformer) Transform(node *ast.Document, reader text.Reader, pc pa // But most importantly ensure the next sibling is still on the old image too v.SetNextSibling(next) - - } else { - log.Debug("ast.Image: %s has parent: %v", link, parent) - } case *ast.Link: // Links need their href to munged to be a real value |