mirror of
https://github.com/Stone-Red-Code/dvc.git
synced 2026-11-02 07:18:25 +01:00
* dvc: get rid of DirInfo DirInfo was created before we had proper objects, as a way to have a structure that represents a staged directory. Right now we have a dedicated Tree object that is specifically meant for that. As a result, HashInfo no longer needs to have dir_info and we no longer need `get_hash/get_dir_hash` helpers. * objects: move Tree into tree.py
217 lines
6.7 KiB
Python
217 lines
6.7 KiB
Python
from operator import itemgetter
|
|
|
|
import pytest
|
|
|
|
from dvc.hash_info import HashInfo
|
|
from dvc.objects import HashFile
|
|
from dvc.objects.tree import Tree, _merge
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"lst, trie_dict",
|
|
[
|
|
([], {}),
|
|
(
|
|
[
|
|
{"md5": "def", "relpath": "zzz"},
|
|
{"md5": "123", "relpath": "foo"},
|
|
{"md5": "abc", "relpath": "aaa"},
|
|
{"md5": "456", "relpath": "bar"},
|
|
],
|
|
{
|
|
("zzz",): HashFile(None, None, HashInfo("md5", "def")),
|
|
("foo",): HashFile(None, None, HashInfo("md5", "123")),
|
|
("bar",): HashFile(None, None, HashInfo("md5", "456")),
|
|
("aaa",): HashFile(None, None, HashInfo("md5", "abc")),
|
|
},
|
|
),
|
|
(
|
|
[
|
|
{"md5": "123", "relpath": "dir/b"},
|
|
{"md5": "456", "relpath": "dir/z"},
|
|
{"md5": "789", "relpath": "dir/a"},
|
|
{"md5": "abc", "relpath": "b"},
|
|
{"md5": "def", "relpath": "a"},
|
|
{"md5": "ghi", "relpath": "z"},
|
|
{"md5": "jkl", "relpath": "dir/subdir/b"},
|
|
{"md5": "mno", "relpath": "dir/subdir/z"},
|
|
{"md5": "pqr", "relpath": "dir/subdir/a"},
|
|
],
|
|
{
|
|
("dir", "b"): HashFile(None, None, HashInfo("md5", "123")),
|
|
("dir", "z"): HashFile(None, None, HashInfo("md5", "456")),
|
|
("dir", "a"): HashFile(None, None, HashInfo("md5", "789")),
|
|
("b",): HashFile(None, None, HashInfo("md5", "abc")),
|
|
("a",): HashFile(None, None, HashInfo("md5", "def")),
|
|
("z",): HashFile(None, None, HashInfo("md5", "ghi")),
|
|
("dir", "subdir", "b"): HashFile(
|
|
None, None, HashInfo("md5", "jkl")
|
|
),
|
|
("dir", "subdir", "z"): HashFile(
|
|
None, None, HashInfo("md5", "mno")
|
|
),
|
|
("dir", "subdir", "a"): HashFile(
|
|
None, None, HashInfo("md5", "pqr")
|
|
),
|
|
},
|
|
),
|
|
],
|
|
)
|
|
def test_list(lst, trie_dict):
|
|
tree = Tree.from_list(lst)
|
|
assert tree._dict == trie_dict
|
|
assert tree.as_list() == sorted(lst, key=itemgetter("relpath"))
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"trie_dict, size",
|
|
[
|
|
({}, 0),
|
|
(
|
|
{
|
|
("a",): HashInfo("md5", "abc", size=1),
|
|
("b",): HashInfo("md5", "def", size=2),
|
|
("c",): HashInfo("md5", "ghi", size=3),
|
|
("dir", "foo"): HashInfo("md5", "jkl", size=4),
|
|
("dir", "bar"): HashInfo("md5", "mno", size=5),
|
|
("dir", "baz"): HashInfo("md5", "pqr", size=6),
|
|
},
|
|
21,
|
|
),
|
|
(
|
|
{
|
|
("a",): HashInfo("md5", "abc", size=1),
|
|
("b",): HashInfo("md5", "def", size=None),
|
|
},
|
|
None,
|
|
),
|
|
],
|
|
)
|
|
def test_size(trie_dict, size):
|
|
tree = Tree(None, None, None)
|
|
tree._dict = trie_dict
|
|
assert tree.size == size
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"trie_dict, nfiles",
|
|
[
|
|
({}, 0),
|
|
(
|
|
{
|
|
("a",): HashInfo("md5", "abc", size=1),
|
|
("b",): HashInfo("md5", "def", size=2),
|
|
("c",): HashInfo("md5", "ghi", size=3),
|
|
("dir", "foo"): HashInfo("md5", "jkl", size=4),
|
|
("dir", "bar"): HashInfo("md5", "mno", size=5),
|
|
("dir", "baz"): HashInfo("md5", "pqr", size=6),
|
|
},
|
|
6,
|
|
),
|
|
(
|
|
{
|
|
("a",): HashInfo("md5", "abc", size=1),
|
|
("b",): HashInfo("md5", "def", size=None),
|
|
},
|
|
2,
|
|
),
|
|
],
|
|
)
|
|
def test_nfiles(trie_dict, nfiles):
|
|
tree = Tree(None, None, None)
|
|
tree._dict = trie_dict
|
|
assert len(tree) == nfiles
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"trie_dict",
|
|
[
|
|
{},
|
|
{
|
|
("a",): HashInfo("md5", "abc"),
|
|
("b",): HashInfo("md5", "def"),
|
|
("c",): HashInfo("md5", "ghi"),
|
|
("dir", "foo"): HashInfo("md5", "jkl"),
|
|
("dir", "bar"): HashInfo("md5", "mno"),
|
|
("dir", "baz"): HashInfo("md5", "pqr"),
|
|
("dir", "subdir", "1"): HashInfo("md5", "stu"),
|
|
("dir", "subdir", "2"): HashInfo("md5", "vwx"),
|
|
("dir", "subdir", "3"): HashInfo("md5", "yz"),
|
|
},
|
|
],
|
|
)
|
|
def test_items(trie_dict):
|
|
tree = Tree(None, None, None)
|
|
tree._dict = trie_dict
|
|
assert list(tree) == list(trie_dict.items())
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"ancestor_dict, our_dict, their_dict, merged_dict",
|
|
[
|
|
({}, {}, {}, {}),
|
|
(
|
|
{("foo",): HashInfo("md5", "123")},
|
|
{
|
|
("foo",): HashInfo("md5", "123"),
|
|
("bar",): HashInfo("md5", "345"),
|
|
},
|
|
{
|
|
("foo",): HashInfo("md5", "123"),
|
|
("baz",): HashInfo("md5", "678"),
|
|
},
|
|
{
|
|
("foo",): HashInfo("md5", "123"),
|
|
("bar",): HashInfo("md5", "345"),
|
|
("baz",): HashInfo("md5", "678"),
|
|
},
|
|
),
|
|
(
|
|
{
|
|
("common",): HashInfo("md5", "123"),
|
|
("subdir", "foo"): HashInfo("md5", "345"),
|
|
},
|
|
{
|
|
("common",): HashInfo("md5", "123"),
|
|
("subdir", "foo"): HashInfo("md5", "345"),
|
|
("subdir", "bar"): HashInfo("md5", "678"),
|
|
},
|
|
{
|
|
("common",): HashInfo("md5", "123"),
|
|
("subdir", "foo"): HashInfo("md5", "345"),
|
|
("subdir", "baz"): HashInfo("md5", "91011"),
|
|
},
|
|
{
|
|
("common",): HashInfo("md5", "123"),
|
|
("subdir", "foo"): HashInfo("md5", "345"),
|
|
("subdir", "bar"): HashInfo("md5", "678"),
|
|
("subdir", "baz"): HashInfo("md5", "91011"),
|
|
},
|
|
),
|
|
(
|
|
{},
|
|
{("foo",): HashInfo("md5", "123")},
|
|
{("bar",): HashInfo("md5", "456")},
|
|
{
|
|
("foo",): HashInfo("md5", "123"),
|
|
("bar",): HashInfo("md5", "456"),
|
|
},
|
|
),
|
|
(
|
|
{},
|
|
{},
|
|
{("bar",): HashInfo("md5", "123")},
|
|
{("bar",): HashInfo("md5", "123")},
|
|
),
|
|
(
|
|
{},
|
|
{("bar",): HashInfo("md5", "123")},
|
|
{},
|
|
{("bar",): HashInfo("md5", "123")},
|
|
),
|
|
],
|
|
)
|
|
def test_merge(ancestor_dict, our_dict, their_dict, merged_dict):
|
|
actual = _merge(ancestor_dict, our_dict, their_dict)
|
|
assert actual == merged_dict
|