Skip to content

dvcfs: handle repo root #7408

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.

Sign up for GitHub

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
efiop merged 1 commit into from
Feb 21, 2022
Merged

dvcfs: handle repo root #7408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dvc/fs/dvc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def _get_key(self, path):

fs_key = "repo"
key = self.path.parts(path)
if key == (".",):
if key == (".",) or key == ("",):
key = ()

return (fs_key, *key)
Expand Down
14 changes: 14 additions & 0 deletions tests/unit/fs/test_dvc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,20 @@
from dvc.utils.fs import remove


@pytest.mark.parametrize(
"path, key",
[
("", ("repo",)),
(".", ("repo",)),
("foo", ("repo", "foo")),
(os.path.join("dir", "foo"), ("repo", "dir", "foo")),
],
)
def test_get_key(tmp_dir, dvc, path, key):
fs = DvcFileSystem(repo=dvc)
assert fs._get_key(path) == key
Comment on lines +22 to +24
Copy link
Contributor Author

@efiop efiop Feb 21, 2022

Choose a reason for hiding this comment

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

As discussed before, a bit of an overkill to use real dvc in unit tests, but still kept using them in this one for simplicity. #7408 is a start to moving to fsspec, where we will scrap most of these tests for something better.



def test_exists(tmp_dir, dvc):
tmp_dir.gen("foo", "foo")
dvc.add("foo")
Expand Down