-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
import/get: escape non-pattern LFS path parts (#10416)
- Loading branch information
Showing
2 changed files
with
80 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,73 @@ | ||
import os | ||
from unittest.mock import ANY | ||
|
||
import pytest | ||
|
||
from dvc.fs import download | ||
|
||
lfs_prefetch_params = [ | ||
pytest.param("abc", "abc", id="plain"), | ||
pytest.param( | ||
"*", | ||
"[*]", | ||
marks=pytest.mark.skipif( | ||
os.name == "nt", | ||
reason="forbidden character `*` on Windows filesystem", | ||
), | ||
id="escape-*", | ||
), | ||
pytest.param( | ||
"**", | ||
"[*][*]", | ||
marks=pytest.mark.skipif( | ||
os.name == "nt", reason="forbidden character `*` on Windows filesystem" | ||
), | ||
id="escape-**", | ||
), | ||
pytest.param( | ||
"?", | ||
"[?]", | ||
marks=pytest.mark.skipif( | ||
os.name == "nt", reason="forbidden character `?` on Windows filesystem" | ||
), | ||
id="escape-?", | ||
), | ||
pytest.param("[abc]", "[[]abc]", id="escape-[seq]"), | ||
pytest.param("[!abc]", "[[]!abc]", id="escape-[!seq]"), | ||
] | ||
|
||
|
||
@pytest.mark.parametrize("dirname, include_name", lfs_prefetch_params) | ||
def test_lfs_prefetch_directory(tmp_dir, dvc, scm, mocker, dirname, include_name): | ||
mock_fetch = mocker.patch("scmrepo.git.lfs.fetch") | ||
tmp_dir.scm_gen( | ||
{ | ||
".gitattributes": "data/**/* filter=lfs diff=lfs merge=lfs -text", | ||
f"data/{dirname}/test.txt": "test data", | ||
}, | ||
commit="init lfs", | ||
) | ||
rev = scm.get_rev() | ||
with dvc.switch(rev): | ||
download(dvc.dvcfs, f"data/{dirname}", "data") | ||
mock_fetch.assert_called_once_with( | ||
scm, [rev], include=[f"/data/{include_name}/**"], progress=ANY | ||
) | ||
|
||
|
||
@pytest.mark.parametrize("basename, include_name", lfs_prefetch_params) | ||
def test_lfs_prefetch_file(tmp_dir, dvc, scm, mocker, basename, include_name): | ||
mock_fetch = mocker.patch("scmrepo.git.lfs.fetch") | ||
tmp_dir.scm_gen( | ||
{ | ||
".gitattributes": "data/**/* filter=lfs diff=lfs merge=lfs -text", | ||
f"data/{basename}.txt": "test data", | ||
}, | ||
commit="init lfs", | ||
) | ||
rev = scm.get_rev() | ||
with dvc.switch(rev): | ||
download(dvc.dvcfs, f"data/{basename}.txt", "data") | ||
mock_fetch.assert_called_once_with( | ||
scm, [rev], include=[f"/data/{include_name}.txt"], progress=ANY | ||
) |