TST: test_partial_unlocked: Document and avoid recent git-annex failure #5639
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
git-annex's 424bef6b6 (smudge: check for known annexed inodes before checking annex.largefiles, 2021-05-03) fixed a case where an unchanged unlocked annexed file that does not match annex.largefiles gets sent to git. That change leads to a racy failure of test_partial_unlocked. The test unlocks a file and then configures .gitattributes so that the file doesn't match annex.largefiles. Before 424bef6b6, providing that file as a pathspec to `git commit` (as `datalad save` does) results in a commit where the file changes to being tracked by git. With 424bef6b6, the above sometimes doesn't happen; instead the commit includes the link to a pointer file change, and the change to being tracked by git remains in the index. This issue has been reported upstream. For now, document it, and adjust the test to avoid the intermittent failure. Closes datalad#5637 [1] https://git-annex.branchable.com/bugs/case_where_using_pathspec_with_git-commit_leaves_s/
yarikoptic
approved these changes
May 4, 2021
|
I am proud of our testing battery ;) |
Codecov Report
@@ Coverage Diff @@
## maint #5639 +/- ##
==========================================
- Coverage 90.20% 90.19% -0.02%
==========================================
Files 299 299
Lines 42247 42262 +15
==========================================
+ Hits 38111 38120 +9
- Misses 4136 4142 +6
Continue to review full report at Codecov.
|
yarikoptic
added
semver-patch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
git-annex's 424bef6b6 (smudge: check for known annexed inodes before
checking annex.largefiles, 2021-05-03) fixed a case where an unchanged
unlocked annexed file that does not match annex.largefiles gets sent
to git.
That change leads to a racy failure of test_partial_unlocked. The
test unlocks a file and then configures .gitattributes so that the
file doesn't match annex.largefiles. Before 424bef6b6, providing that
file as a pathspec to
git commit(asdatalad savedoes) results ina commit where the file changes to being tracked by git. With
424bef6b6, the above sometimes doesn't happen; instead the commit
includes the link to a pointer file change, and the change to being
tracked by git remains in the index.
This issue has been reported upstream. For now, document it, and
adjust the test to avoid the intermittent failure.
Closes #5637
[1] https://git-annex.branchable.com/bugs/case_where_using_pathspec_with_git-commit_leaves_s/