Skip to content
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.

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

test_no_annex: Update for git-annex-smudge fix #5632

Merged
merged 2 commits into from May 4, 2021

Conversation

kyleam
Copy link
Contributor

@kyleam kyleam commented May 3, 2021

This follows up on gh-5579. There is now a fix on git-annex's end that addresses the original intermittent failure of test_no_annex (gh-5300).

kyleam added 2 commits May 3, 2021 16:24
4a9824b (TST: no_annex: Avoid racy failure on adjusted branches,
2021-04-16) adjusted test_no_annex to avoid intermittent failures.  An
associated issue was raised on the git-annex site [1], and there has
now been a change on the git-annex side to work around the problem:
424bef6b6 (smudge: check for known annexed inodes before checking
annex.largefiles, 2021-05-03).

That change resolves the original intermittent test_no_annex failure,
However, the touch workaround added to test_no_annex interacts with
the change in git-annex, leading to an intermittent failure:

| test_no_annex workaround | git-annex fix | intermittent failure? |
| (4a9824b)             | (424bef6b6)   |                       |
|--------------------------+---------------+-----------------------|
| no                       | no            | yes                   |
| yes                      | no            | no                    |
| yes                      | yes           | yes                   | <=
| no                       | yes           | no                    |

I don't have a good understanding of the underlying reason for the
interaction, but the git-annex commit (424bef6b6) does mention that
the fix won't handle the case where the file is modified/touched.

Drop the test workaround on our side, and instead skip the
intermittent failure if we're on an adjusted branch and have an older
git-annex.

[1] https://git-annex.branchable.com/forum/one-off_unlocked_annex_files_that_go_against_large/
@kyleam
Copy link
Contributor Author

kyleam commented May 4, 2021

Thanks for the review, @yarikoptic

appveyor failure is a macOS startup issue.

@kyleam kyleam merged commit 6de67a4 into datalad:maint May 4, 2021
@kyleam kyleam deleted the no-annex-clean-race-update branch May 4, 2021 22:20
@yarikoptic yarikoptic added the semver-patch Increment the patch version when merged label Jun 2, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
semver-patch Increment the patch version when merged
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants