Skip to content

Do not show full lfs file on error in git_test.go:rawTest() #14980

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 14, 2021
Merged

Do not show full lfs file on error in git_test.go:rawTest() #14980

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3499d32
Do not show full lfs file on error in git_test.go:rawTest()
zeripath Mar 12, 2021
9f319f5
better
zeripath Mar 12, 2021
dc03742
Merge branch 'master' into no-diff-on-error-during-lfs-test
lunny Mar 13, 2021
217340d
Merge branch 'master' into no-diff-on-error-during-lfs-test
zeripath Mar 13, 2021
1668b88
Merge branch 'master' into no-diff-on-error-during-lfs-test
zeripath Mar 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions integrations/git_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,10 @@ func rawTest(t *testing.T, ctx *APITestContext, little, big, littleLFS, bigLFS s
req = NewRequest(t, "GET", path.Join("/", username, reponame, "/raw/branch/master/", littleLFS))
resp = session.MakeRequest(t, req, http.StatusOK)
assert.NotEqual(t, littleSize, resp.Body.Len())
assert.Contains(t, resp.Body.String(), models.LFSMetaFileIdentifier)
assert.LessOrEqual(t, resp.Body.Len(), 1024)
if resp.Body.Len() != littleSize && resp.Body.Len() <= 1024 {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This condition is already asserted above, right?
Can't we check for the exact expected length?
Are there tests for small and large files?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The reason for the changes being the way they are is because of the contains below this line.

If the resp.Body does not contain the expected value it will be emitted whole into the test response.

This is bad and completely unreadable - we therefore need to skip doing that test in that case.

assert.Contains(t, resp.Body.String(), models.LFSMetaFileIdentifier)
}
}

if !testing.Short() {
Expand All @@ -228,7 +231,9 @@ func rawTest(t *testing.T, ctx *APITestContext, little, big, littleLFS, bigLFS s
req = NewRequest(t, "GET", path.Join("/", username, reponame, "/raw/branch/master/", bigLFS))
resp = session.MakeRequest(t, req, http.StatusOK)
assert.NotEqual(t, bigSize, resp.Body.Len())
assert.Contains(t, resp.Body.String(), models.LFSMetaFileIdentifier)
if resp.Body.Len() != bigSize && resp.Body.Len() <= 1024 {
assert.Contains(t, resp.Body.String(), models.LFSMetaFileIdentifier)
}
}
}
})
Expand Down