Skip to content

Skip with_sameas_remote when rsync and annex are incompatible #7342

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

Merged
merged 2 commits into from
Mar 25, 2023

Conversation

bpoldrack
Copy link
Member

@bpoldrack bpoldrack commented Mar 21, 2023

A fix in rsync 3.2.4 broke compatibility with older annex versions.
To make things a bit more complicated, ubuntu pulled that fix into
their rsync package for 3.1.3-8.

Adjust the test wrapper's existing skip conditions in accordingly and
reenable the test.

Closes #7320

@codecov
Copy link

codecov bot commented Mar 21, 2023

Codecov Report

Patch coverage has no change and project coverage change: -52.65 ⚠️

Comparison is base (f392b4b) 88.13% compared to head (4f07a4f) 35.49%.

❗ Current head 4f07a4f differs from pull request most recent head 8bdd95e. Consider uploading reports for the commit 8bdd95e to get more accurate results

Additional details and impacted files
@@             Coverage Diff             @@
##            maint    #7342       +/-   ##
===========================================
- Coverage   88.13%   35.49%   -52.65%     
===========================================
  Files         327      327               
  Lines       44556    44549        -7     
===========================================
- Hits        39270    15811    -23459     
- Misses       5286    28738    +23452     

see 261 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@bpoldrack bpoldrack force-pushed the dbg-7320 branch 3 times, most recently from df6736f to 2beb6d6 Compare March 24, 2023 14:38
A fix in rsync 3.2.4 broke compatibility with older annex versions.
To make things a bit more complicated, ubuntu pulled that fix into
their rsync package for 3.1.3-8.

Adjust the test wrapper's existing skip conditions in accordingly and
reenable the test.

Closes datalad#7320
@bpoldrack bpoldrack changed the title debug Skip with_sameas_remote when rsync and annex are incompatible Mar 24, 2023
@bpoldrack bpoldrack marked this pull request as ready for review March 24, 2023 14:41
@bpoldrack bpoldrack added semver-tests Changes only affect tests, no impact on version CHANGELOG-missing When a PR's description does not contain a changelog item, yet. labels Mar 24, 2023
@github-actions github-actions bot removed the CHANGELOG-missing When a PR's description does not contain a changelog item, yet. label Mar 24, 2023
# If we have a debian package version, use this as rsync version.
# Otherwise report what `rsync --version` itself has to say.
if ver:
return ver
Copy link
Member

Choose a reason for hiding this comment

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

IMHO this (above) is overkill since we are just talking about either we should skip the test while testing against some older git-annex .

And since this functionality is already in external_versions, then why not to assign to be reported for cmd:annex and thus avoid manual LooseVersion'ing here, and then just external_versions['cmd:rsync'] >=3.1.3 in the test? Eventually that skip would be gone anyways whenever we boost minimal git-annex version beyond that one.

or am I still missing the point warranting above complexity?

@yarikoptic
Copy link
Member

ok, if anything improvement can follow as a PR, let's proceed for now as is.

@yarikoptic
Copy link
Member

thank you @bpoldrack !

@yarikoptic yarikoptic merged commit 6a0b24d into datalad:maint Mar 25, 2023
@yarikoptic-gitmate
Copy link
Collaborator

PR released in 0.18.3

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
semver-tests Changes only affect tests, no impact on version
Projects
None yet
Development

Successfully merging this pull request may close these issues.

test_sibling_enable_sameas started to FAIL on appveyor (Ubu) recently
3 participants