dvc: rename tree -> fs (#5461)

This commit is contained in:
Ruslan Kuprieiev
2021-02-13 15:40:44 +02:00
committed by GitHub
parent 9ce6bce9b6
commit b0fd40f12c
147 changed files with 1835 additions and 1857 deletions
+28 -28
View File
@@ -28,8 +28,8 @@ def test_new_simple(tmp_dir, scm, dvc, exp_stage, mocker, name, workspace):
assert ref_info and ref_info.baseline_sha == baseline
new_mock.assert_called_once()
tree = scm.get_tree(exp)
with tree.open(tmp_dir / "metrics.yaml") as fobj:
fs = scm.get_fs(exp)
with fs.open(tmp_dir / "metrics.yaml") as fobj:
assert fobj.read().strip() == "foo: 2"
if workspace:
@@ -68,8 +68,8 @@ def test_experiment_exists(tmp_dir, scm, dvc, exp_stage, mocker, workspace):
)
exp = first(results)
tree = scm.get_tree(exp)
with tree.open(tmp_dir / "metrics.yaml") as fobj:
fs = scm.get_fs(exp)
with fs.open(tmp_dir / "metrics.yaml") as fobj:
assert fobj.read().strip() == "foo: 3"
@@ -142,8 +142,8 @@ def test_modify_params(tmp_dir, scm, dvc, mocker, changes, expected):
exp = first(results)
new_mock.assert_called_once()
tree = scm.get_tree(exp)
with tree.open(tmp_dir / "metrics.yaml") as fobj:
fs = scm.get_fs(exp)
with fs.open(tmp_dir / "metrics.yaml") as fobj:
assert fobj.read().strip() == expected
@@ -238,10 +238,10 @@ def test_update_py_params(tmp_dir, scm, dvc):
)
exp_a = first(results)
tree = scm.get_tree(exp_a)
with tree.open(tmp_dir / "params.py") as fobj:
fs = scm.get_fs(exp_a)
with fs.open(tmp_dir / "params.py") as fobj:
assert fobj.read().strip() == "INT = 2"
with tree.open(tmp_dir / "metrics.py") as fobj:
with fs.open(tmp_dir / "metrics.py") as fobj:
assert fobj.read().strip() == "INT = 2"
tmp_dir.gen(
@@ -280,10 +280,10 @@ def test_update_py_params(tmp_dir, scm, dvc):
# in order to compare with the original
return text.replace("\r\n", "\n")
tree = scm.get_tree(exp_a)
with tree.open(tmp_dir / "params.py") as fobj:
fs = scm.get_fs(exp_a)
with fs.open(tmp_dir / "params.py") as fobj:
assert _dos2unix(fobj.read().strip()) == result
with tree.open(tmp_dir / "metrics.py") as fobj:
with fs.open(tmp_dir / "metrics.py") as fobj:
assert _dos2unix(fobj.read().strip()) == result
tmp_dir.gen("params.py", "INT = 1\n")
@@ -406,11 +406,11 @@ def test_untracked(tmp_dir, scm, dvc, caplog, workspace):
stage.addressing, params=["foo=2"], tmp_dir=not workspace
)
exp = first(results)
tree = scm.get_tree(exp)
assert tree.exists("dvc.yaml")
assert tree.exists("dvc.lock")
assert tree.exists("copy.py")
with tree.open(tmp_dir / "metrics.yaml") as fobj:
fs = scm.get_fs(exp)
assert fs.exists("dvc.yaml")
assert fs.exists("dvc.lock")
assert fs.exists("copy.py")
with fs.open(tmp_dir / "metrics.yaml") as fobj:
assert fobj.read().strip() == "foo: 2"
@@ -428,8 +428,8 @@ def test_dirty_lockfile(tmp_dir, scm, dvc, exp_stage, workspace):
)
exp = first(results)
tree = scm.get_tree(exp)
with tree.open(tmp_dir / "metrics.yaml") as fobj:
fs = scm.get_fs(exp)
with fs.open(tmp_dir / "metrics.yaml") as fobj:
assert fobj.read().strip() == "foo: 2"
if not workspace:
@@ -509,10 +509,10 @@ def test_subdir(tmp_dir, scm, dvc, workspace):
exp = first(results)
ref_info = first(exp_refs_by_rev(scm, exp))
tree = scm.get_tree(exp)
fs = scm.get_fs(exp)
for fname in ["metrics.yaml", "dvc.lock"]:
assert tree.exists(subdir / fname)
with tree.open(subdir / "metrics.yaml") as fobj:
assert fs.exists(subdir / fname)
with fs.open(subdir / "metrics.yaml") as fobj:
assert fobj.read().strip() == "foo: 2"
assert dvc.experiments.get_exact_name(exp) == ref_info.name
@@ -521,7 +521,7 @@ def test_subdir(tmp_dir, scm, dvc, workspace):
@pytest.mark.parametrize("workspace", [True, False])
def test_subrepo(tmp_dir, scm, workspace):
from tests.unit.tree.test_repo import make_subrepo
from tests.unit.fs.test_repo import make_subrepo
subrepo = tmp_dir / "dir" / "repo"
make_subrepo(subrepo, scm)
@@ -554,10 +554,10 @@ def test_subrepo(tmp_dir, scm, workspace):
exp = first(results)
ref_info = first(exp_refs_by_rev(scm, exp))
tree = scm.get_tree(exp)
fs = scm.get_fs(exp)
for fname in ["metrics.yaml", "dvc.lock"]:
assert tree.exists(subrepo / fname)
with tree.open(subrepo / "metrics.yaml") as fobj:
assert fs.exists(subrepo / fname)
with fs.open(subrepo / "metrics.yaml") as fobj:
assert fobj.read().strip() == "foo: 2"
assert subrepo.dvc.experiments.get_exact_name(exp) == ref_info.name
@@ -577,8 +577,8 @@ def test_queue(tmp_dir, scm, dvc, exp_stage, mocker):
expected = {"foo: 2", "foo: 3"}
metrics = set()
for exp in results:
tree = scm.get_tree(exp)
with tree.open(tmp_dir / "metrics.yaml") as fobj:
fs = scm.get_fs(exp)
with fs.open(tmp_dir / "metrics.yaml") as fobj:
metrics.add(fobj.read().strip())
assert expected == metrics