From 8a020133e9ff75395d035c01a40182e7d1de6a4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20M=C3=B6nch?= Date: Tue, 4 Jun 2024 09:55:31 +0200 Subject: [PATCH] fix(tests): fix windows tests --- datalad_next/patches/tests/test_patched_ria_ora.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/datalad_next/patches/tests/test_patched_ria_ora.py b/datalad_next/patches/tests/test_patched_ria_ora.py index 02b625f2..ab967feb 100644 --- a/datalad_next/patches/tests/test_patched_ria_ora.py +++ b/datalad_next/patches/tests/test_patched_ria_ora.py @@ -63,7 +63,6 @@ assert_true, create_tree, has_symlink_capability, - known_failure_githubci_win, known_failure_windows, ok_, rmtree, @@ -150,7 +149,7 @@ def _postclonetest_prepare(lcl, storepath, storepath2, link): create_ds_in_store(io, ppp_storepath2, d.id, '2', '1') d.create_sibling_ria(url2, "anotherstore", new_store_ok=True) d.push('.', to='anotherstore', data='nothing') - store2_loc, _, _ = get_layout_locations(1, ppp_storepath2, d.id) + store2_loc, _, _ = get_layout_locations(1, storepath2, d.id) Runner(cwd=str(store2_loc)).run(['git', 'update-server-info']) # Now the store to clone from: @@ -179,7 +178,7 @@ def _postclonetest_prepare(lcl, storepath, storepath2, link): 'store-storage', 'autoenable=false']) d.push('.', to='store') - store_loc, _, _ = get_layout_locations(1, ppp_storepath, d.id) + store_loc, _, _ = get_layout_locations(1, storepath, d.id) Runner(cwd=str(store_loc)).run(['git', 'update-server-info']) link.unlink() @@ -225,7 +224,7 @@ def test_ria_postclone_noannex(existing_dataset, tmp_path): assert_false(annex.exists()) clone( - f"ria+{get_local_file_url(str(url_ria_store_path), compatibility='git')}#{ds.id}", + f"ria+{get_local_file_url(str(ria_store_path), compatibility='git')}#{ds.id}", tmp_path / 'cloned_ds' ) assert_false(annex.exists()) @@ -1108,6 +1107,7 @@ def test_gitannex_local(): # TODO?: make parametric again on _test_ria_postclonecfg # PATCH remove @know_failure_windows @slow # 14 sec on travis +@known_failure_windows # https://github.com/datalad/datalad/issues/5134 def test_ria_postclonecfg(sshserver): if not has_symlink_capability():