Skip to content

Commit

Permalink
fix(tests): fix windows tests
Browse files Browse the repository at this point in the history
  • Loading branch information
christian-monch committed Jun 4, 2024
1 parent fe23f73 commit 8a02013
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions datalad_next/patches/tests/test_patched_ria_ora.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@
assert_true,
create_tree,
has_symlink_capability,
known_failure_githubci_win,
known_failure_windows,
ok_,
rmtree,
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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())
Expand Down Expand Up @@ -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():
Expand Down

0 comments on commit 8a02013

Please sign in to comment.