lunny/git-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4960 from chrisd8088/tidy-and-expand-tests

Browse Source 
Adjust test helpers and tests related to path filtering
This commit is contained in:
Chris Darroch 2022-04-25 08:31:41 -07:00 committed by GitHub
commit efc4bcba18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 30 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
commands/command_prune.go
View File

@ -353,7 +353,6 @@ func pruneTaskGetRetainedAtRef(gitscanner *lfs.GitScanner, ref string, retainCha
defer waitg.Done()
err := gitscanner.ScanRef(ref, func(p *lfs.WrappedPointer, err error) {
if err != nil {
errorChan <- err
return
@ -375,7 +374,6 @@ func pruneTaskGetPreviousVersionsOfRef(gitscanner *lfs.GitScanner, ref string, s
defer waitg.Done()
err := gitscanner.ScanPreviousVersions(ref, since, func(p *lfs.WrappedPointer, err error) {
if err != nil {
errorChan <- err
return

18
lfs/gitscanner_log.go
View File

@ -18,8 +18,9 @@ import (
"github.com/rubyist/tracerx"
)
// When scanning diffs e.g. parseLogOutputToPointers, which direction of diff to include
// data from, i.e. '+' or '-'. Depending on what you're scanning for either might be useful
// When scanning diffs with parseScannerLogOutput(), the direction of diff
// to include data from, i.e., '+' or '-'. Depending on what you're scanning
// for either might be useful.
type LogDiffDirection byte
const (
@ -181,19 +182,6 @@ func logPreviousSHAs(cb GitScannerFoundPointer, ref string, since time.Time) err
return nil
}
func parseLogOutputToPointers(log io.Reader, dir LogDiffDirection,
includePaths, excludePaths []string, results chan *WrappedPointer) {
scanner := newLogScanner(dir, log)
if len(includePaths)+len(excludePaths) > 0 {
scanner.Filter = filepathfilter.New(includePaths, excludePaths, filepathfilter.GitAttributes)
}
for scanner.Scan() {
if p := scanner.Pointer(); p != nil {
results <- p
}
}
}
// logScanner parses log output formatted as per logLfsSearchArgs & returns
// pointers.
type logScanner struct {

13
t/t-fsck.sh
View File

@ -273,13 +273,20 @@ setup_invalid_objects () {
git lfs track *.dat
echo "test data" > a.dat
echo "test data 2" > b.dat
git add .gitattributes *.dat
mkdir foo
echo "test test 3" > foo/a.dat
echo "test data 4" > foo/b.dat
git add .gitattributes *.dat foo
git commit -m "first commit"
oid1=$(calc_oid_file a.dat)
oid2=$(calc_oid_file b.dat)
oid3=$(calc_oid_file foo/a.dat)
oid4=$(calc_oid_file foo/b.dat)
echo "CORRUPTION" >>".git/lfs/objects/${oid1:0:2}/${oid1:2:2}/$oid1"
rm ".git/lfs/objects/${oid2:0:2}/${oid2:2:2}/$oid2"
echo "CORRUPTION" >>".git/lfs/objects/${oid3:0:2}/${oid3:2:2}/$oid3"
rm ".git/lfs/objects/${oid4:0:2}/${oid4:2:2}/$oid4"
}
begin_test "fsck detects invalid objects"
@ -297,6 +304,8 @@ begin_test "fsck detects invalid objects"
[ "$RET" -eq 1 ]
[ $(grep -c 'objects: corruptObject: a.dat (.*) is corrupt' test.log) -eq 1 ]
[ $(grep -c 'objects: openError: b.dat (.*) could not be checked: .*' test.log) -eq 1 ]
[ $(grep -c 'objects: corruptObject: foo/a.dat (.*) is corrupt' test.log) -eq 1 ]
[ $(grep -c 'objects: openError: foo/b.dat (.*) could not be checked: .*' test.log) -eq 1 ]
[ $(grep -c 'objects: repair: moving corrupt objects to .*' test.log) -eq 1 ]
cd ..
@ -311,6 +320,8 @@ begin_test "fsck detects invalid objects"
[ "$RET" -eq 1 ]
[ $(grep -c 'objects: corruptObject: a.dat (.*) is corrupt' test.log) -eq 1 ]
[ $(grep -c 'objects: openError: b.dat (.*) could not be checked: .*' test.log) -eq 1 ]
[ $(grep -c 'objects: corruptObject: foo/a.dat (.*) is corrupt' test.log) -eq 1 ]
[ $(grep -c 'objects: openError: foo/b.dat (.*) could not be checked: .*' test.log) -eq 1 ]
[ $(grep -c 'objects: repair: moving corrupt objects to .*' test.log) -eq 1 ]
)
end_test

2
t/t-migrate-fixup.sh
View File

@ -34,7 +34,7 @@ begin_test "migrate import (--fixup, complex nested)"
git lfs migrate import --everything --fixup --yes
assert_pointer "refs/heads/main" "a.txt" "$a_oid" "1"
refute_pointer "refs/heads/main" "b.txt"
refute_pointer "refs/heads/main" "dir/b.txt"
assert_local_object "$a_oid" "1"
refute_local_object "$b_oid" "1"

4
t/t-prune-worktree.sh
View File

@ -6,7 +6,6 @@ ensure_git_version_isnt $VERSION_LOWER "2.5.0"
begin_test "prune worktree"
(
set -e
reponame="prune_worktree"
@ -102,8 +101,5 @@ begin_test "prune worktree"
git lfs prune --dry-run 2>&1 | tee prune.log
grep "prune: 6 local objects, 2 retained, done." prune.log
grep "prune: 4 files would be pruned" prune.log
)
end_test

22
t/t-prune.sh
View File

@ -26,7 +26,6 @@ begin_test "prune unreferenced and old"
oid_retain1=$(calc_oid "$content_retain1")
oid_retain2=$(calc_oid "$content_retain2")
# Remember for something to be 'too old' it has to appear on the MINUS side
# of the diff outside the prune window, i.e. it's not when it was introduced
# but when it disappeared from relevance. That's why changes to file1.dat on main
@ -110,7 +109,6 @@ begin_test "prune keep unpushed"
git lfs track "*.dat" 2>&1 | tee track.log
grep "Tracking \"\*.dat\"" track.log
content_keepunpushedhead1="Keep: unpushed HEAD 1"
content_keepunpushedhead2="Keep: unpushed HEAD 2"
content_keepunpushedhead3="Keep: unpushed HEAD 3"
@ -172,7 +170,7 @@ begin_test "prune keep unpushed"
git lfs prune
# Now push main and show that older versions on main will be removed
# Now push main and show that only older versions on main will be removed.
git push origin main
git lfs prune --verbose 2>&1 | tee prune.log
@ -183,14 +181,14 @@ begin_test "prune keep unpushed"
refute_local_object "$oid_keepunpushedhead1"
refute_local_object "$oid_keepunpushedhead2"
# MERGE the secondary branch, delete the branch then push main, then make sure
# we delete the intermediate commits but also make sure they're on server
# resolve conflicts by taking other branch
# Merge the unpushed branch, delete it, and then push main.
# Resolve conflicts by taking other branch.
git merge -Xtheirs branch_unpushed
git branch -D branch_unpushed
git lfs prune --dry-run
git push origin main
# Now make sure we purged all the intermediate commits but also make sure
# they are on the remote.
git lfs prune --verbose 2>&1 | tee prune.log
grep "prune: 4 local objects, 1 retained" prune.log
grep "prune: Deleting objects: 100% (3/3), done." prune.log
@ -199,12 +197,11 @@ begin_test "prune keep unpushed"
grep "$oid_keepunpushedhead3" prune.log
refute_local_object "$oid_keepunpushedbranch1"
refute_local_object "$oid_keepunpushedbranch2"
# we used -Xtheirs so old head state is now obsolete, is the last state on branch
# We used -Xtheirs when merging the branch so the old HEAD is now obsolete.
refute_local_object "$oid_keepunpushedhead3"
assert_server_object "remote_$reponame" "$oid_keepunpushedbranch1"
assert_server_object "remote_$reponame" "$oid_keepunpushedbranch2"
assert_server_object "remote_$reponame" "$oid_keepunpushedhead3"
)
end_test
@ -243,7 +240,6 @@ begin_test "prune keep recent"
oid_prunecommitbranch2=$(calc_oid "$content_prunecommitbranch2")
oid_prunecommithead=$(calc_oid "$content_prunecommithead")
# use a single file so each commit supersedes the last, if different files
# then history becomes harder to track
# Also note that when considering 'recent' when editing a single file, it means
@ -325,7 +321,6 @@ begin_test "prune keep recent"
# push everything so that's not a reason to retain
git push origin main:main branch_old:branch_old branch1:branch1 branch2:branch2
git lfs prune --verbose 2>&1 | tee prune.log
grep "prune: 11 local objects, 6 retained, done." prune.log
grep "prune: Deleting objects: 100% (5/5), done." prune.log
@ -368,7 +363,6 @@ begin_test "prune keep recent"
assert_local_object "$oid_keephead" "${#content_keephead}"
refute_local_object "$oid_keeprecentbranch1tip"
refute_local_object "$oid_keeprecentbranch2tip"
)
end_test
@ -435,9 +429,6 @@ begin_test "prune remote tests"
git lfs prune --verbose --dry-run 2>&1 | tee prune.log
grep "prune: 4 local objects, 1 retained, done." prune.log
grep "prune: 3 files would be pruned" prune.log
)
end_test
@ -534,7 +525,6 @@ begin_test "prune verify"
refute_local_object "$oid_commit1"
refute_local_object "$oid_commit2_failverify"
refute_local_object "$oid_commit3"
)
end_test

10
t/testhelpers.sh
View File

@ -2,6 +2,9 @@
# assert_pointer confirms that the pointer in the repository for $path in the
# given $ref matches the given $oid and $size.
# Note that $path is prepended with a space to match the against the start
# of path field in the ls-tree output, so be careful if your test involves
# files with spaces in their paths.
#
# $ assert_pointer "main" "path/to/file" "some-oid" 123
assert_pointer() {
@ -14,7 +17,7 @@ assert_pointer() {
while read -r -d $'\0' x; do
echo $x
done |
grep -F "$path" | cut -f 3 -d " ")
grep -F " $path" | cut -f 3 -d " ")
actual=$(git cat-file -p $gitblob)
expected=$(pointer $oid $size)
@ -26,6 +29,9 @@ assert_pointer() {
# refute_pointer confirms that the file in the repository for $path in the
# given $ref is _not_ a pointer.
# Note that $path is prepended with a space to match the against the start
# of path field in the ls-tree output, so be careful if your test involves
# files with spaces in their paths.
#
# $ refute_pointer "main" "path/to/file"
refute_pointer() {
@ -36,7 +42,7 @@ refute_pointer() {
while read -r -d $'\0' x; do
echo $x
done |
grep "$path" | cut -f 3 -d " ")
grep -F " $path" | cut -f 3 -d " ")
file=$(git cat-file -p $gitblob)
version="version https://git-lfs.github.com/spec/v[0-9]"