Stone_Red/dvc
1
0
Fork 0
mirror of https://github.com/Stone-Red-Code/dvc.git synced 2026-11-02 07:18:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix after renaming dvc fixture to dvc_repo.

Browse Source
This commit is contained in:
David Příhoda
2019-05-27 14:14:44 +02:00
parent e11c3cbbc5
commit d072c2bd79
1 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/func/test_repro.py
+26 -20
View File
@@ -1371,7 +1371,7 @@ class TestShouldDisplayMetricsOnReproWithMetricsOption(TestDvc):
@pytest.fixture
def repro_dir(dvc, repo_dir):
def repro_dir(dvc_repo, repo_dir):
repo_dir.dname = "dir"
os.mkdir(repo_dir.dname)
repo_dir.emptydname = "emptydir"
@@ -1381,7 +1381,7 @@ def repro_dir(dvc, repo_dir):
repo_dir.source = "source"
repo_dir.source_stage = repo_dir.source + ".dvc"
stage = dvc.run(
stage = dvc_repo.run(
fname=repo_dir.source_stage,
outs=[repo_dir.source],
deps=[repo_dir.FOO],
@@ -1391,7 +1391,7 @@ def repro_dir(dvc, repo_dir):
repo_dir.unrelated1 = "unrelated1"
repo_dir.unrelated1_stage = repo_dir.unrelated1 + ".dvc"
stage = dvc.run(
stage = dvc_repo.run(
fname=repo_dir.unrelated1_stage,
outs=[repo_dir.unrelated1],
deps=[repo_dir.source],
@@ -1400,7 +1400,7 @@ def repro_dir(dvc, repo_dir):
repo_dir.unrelated2 = "unrelated2"
repo_dir.unrelated2_stage = repo_dir.unrelated2 + ".dvc"
stage = dvc.run(
stage = dvc_repo.run(
fname=repo_dir.unrelated2_stage,
outs=[repo_dir.unrelated2],
deps=[repo_dir.DATA],
@@ -1410,7 +1410,7 @@ def repro_dir(dvc, repo_dir):
repo_dir.first = os.path.join(repo_dir.dname, "first")
repo_dir.first_stage = repo_dir.first + ".dvc"
stage = dvc.run(
stage = dvc_repo.run(
fname=repo_dir.first_stage,
deps=[repo_dir.source],
outs=[repo_dir.first],
@@ -1423,7 +1423,7 @@ def repro_dir(dvc, repo_dir):
repo_dir.second = os.path.join(subdname, "second")
repo_dir.second_stage = repo_dir.second + ".dvc"
stage = dvc.run(
stage = dvc_repo.run(
fname=repo_dir.second_stage,
outs=[repo_dir.second],
deps=[repo_dir.DATA],
@@ -1432,7 +1432,7 @@ def repro_dir(dvc, repo_dir):
assert filecmp.cmp(repo_dir.second, repo_dir.DATA, shallow=False)
repo_dir.third_stage = os.path.join(repo_dir.dname, "Dvcfile")
stage = dvc.run(
stage = dvc_repo.run(
fname=repo_dir.third_stage, deps=[repo_dir.first, repo_dir.second]
)
assert stage is not None
@@ -1440,14 +1440,14 @@ def repro_dir(dvc, repo_dir):
yield repo_dir
def test_recursive_repro_default(dvc, repro_dir):
def test_recursive_repro_default(dvc_repo, repro_dir):
"""
Test recursive repro on dir after a dep outside this dir has changed.
"""
os.unlink(repro_dir.FOO)
shutil.copyfile(repro_dir.BAR, repro_dir.FOO)
stages = dvc.reproduce(repro_dir.dname, recursive=True)
stages = dvc_repo.reproduce(repro_dir.dname, recursive=True)
# Check that the dependency ("source") and the dependent stages
# inside the folder have been reproduced ("first", "third")
assert len(stages) == 3
@@ -1459,7 +1459,7 @@ def test_recursive_repro_default(dvc, repro_dir):
assert filecmp.cmp(repro_dir.first, repro_dir.BAR, shallow=False)
def test_recursive_repro_single(dvc, repro_dir):
def test_recursive_repro_single(dvc_repo, repro_dir):
"""
Test recursive single-item repro on dir
after a dep outside this dir has changed.
@@ -1470,7 +1470,9 @@ def test_recursive_repro_single(dvc, repro_dir):
os.unlink(repro_dir.DATA)
shutil.copyfile(repro_dir.BAR, repro_dir.DATA)
stages = dvc.reproduce(repro_dir.dname, recursive=True, single_item=True)
stages = dvc_repo.reproduce(
repro_dir.dname, recursive=True, single_item=True
)
# Check that just stages inside given dir
# with changed direct deps have been reproduced.
# This means that "first" stage should not be reproduced
@@ -1482,12 +1484,12 @@ def test_recursive_repro_single(dvc, repro_dir):
assert filecmp.cmp(repro_dir.second, repro_dir.BAR, shallow=False)
def test_recursive_repro_single_force(dvc, repro_dir):
def test_recursive_repro_single_force(dvc_repo, repro_dir):
"""
Test recursive single-item force repro on dir
without any dependencies changing.
"""
stages = dvc.reproduce(
stages = dvc_repo.reproduce(
repro_dir.dname, recursive=True, single_item=True, force=True
)
assert len(stages) == 3
@@ -1506,29 +1508,33 @@ def test_recursive_repro_single_force(dvc, repro_dir):
)
def test_recursive_repro_empty_dir(dvc, repro_dir):
def test_recursive_repro_empty_dir(dvc_repo, repro_dir):
"""
Test recursive repro on an empty directory
"""
stages = dvc.reproduce(repro_dir.emptydname, recursive=True, force=True)
stages = dvc_repo.reproduce(
repro_dir.emptydname, recursive=True, force=True
)
assert len(stages) == 0
def test_recursive_repro_recursive_missing_file(dvc):
def test_recursive_repro_recursive_missing_file(dvc_repo):
"""
Test recursive repro on a missing file
"""
with pytest.raises(StageFileDoesNotExistError):
dvc.reproduce("notExistingStage.dvc", recursive=True)
dvc_repo.reproduce("notExistingStage.dvc", recursive=True)
with pytest.raises(StageFileDoesNotExistError):
dvc.reproduce("notExistingDir/", recursive=True)
dvc_repo.reproduce("notExistingDir/", recursive=True)
def test_recursive_repro_on_stage_file(dvc, repro_dir):
def test_recursive_repro_on_stage_file(dvc_repo, repro_dir):
"""
Test recursive repro on a stage file instead of directory
"""
stages = dvc.reproduce(repro_dir.first_stage, recursive=True, force=True)
stages = dvc_repo.reproduce(
repro_dir.first_stage, recursive=True, force=True
)
assert len(stages) == 2
names = [stage.relpath for stage in stages]
assert repro_dir.source_stage in names