Merge pull request #7581 from christian-monch/fix-test-force-checkdat…

…apresent Relax condition in `test_force_checkdatapresent` to avoid flaky test failures
datalad · Apr 19, 2024 · 8639b90 · 8639b90
2 parents 84b2bd5 + 73fa6d5
commit 8639b90
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/changelog.d/pr-7581.md b/changelog.d/pr-7581.md
@@ -0,0 +1,3 @@
+### 🧪 Tests
+
+- Relax condition in `test_force_checkdatapresent` to avoid flaky test failures.  [PR #7581](https://github.com/datalad/datalad/pull/7581) (by [@christian-monch](https://github.com/christian-monch))
diff --git a/datalad/core/distributed/tests/test_push.py b/datalad/core/distributed/tests/test_push.py
@@ -499,11 +499,8 @@ def test_force_checkdatapresent(srcpath=None, dstpath=None):
         # before then -- we would report that update was pushed since update had a
         # slightly different git-annex timestamp locally from the remote, and thus commits
         # were different
-        if external_versions['cmd:annex'] < '10.20231212':
-            assert_in_results(res, action='publish', status='ok',
-                              refspec='refs/heads/git-annex:refs/heads/git-annex')
-        else:
-            raise
+        assert_in_results(res, action='publish', status='ok',
+                          refspec='refs/heads/git-annex:refs/heads/git-annex')
 
     assert_in_results(res, status='ok',
                       path=str(src.pathobj / 'test_mod_annex_file'),