Stone_Red/dvc
1
0
Fork 0
mirror of https://github.com/Stone-Red-Code/dvc.git synced 2026-11-10 15:28:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

tests: rename dvc repo fixture

Browse Source
This commit is contained in:
pawel
2019-05-21 15:04:43 -07:00
parent 3e461f8f11
commit 01c2f6c174
12 changed files with 70 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/conftest.py
+1 -1
View File
@@ -67,7 +67,7 @@ def git(repo_dir):
@pytest.fixture
def dvc(repo_dir, git):
def dvc_repo(repo_dir, git):
try:
dvc = DvcRepo.init(repo_dir._root_dir)
dvc.scm.commit("init dvc")
tests/func/test_add.py
+1 -1
View File
@@ -547,7 +547,7 @@ class TestAddUnprotected(TestDvc):
@pytest.mark.skipif(os.name != "nt", reason="Windows specific")
def test_windows_should_add_when_cache_on_different_drive(
dvc, repo_dir, temporary_windows_drive
dvc_repo, repo_dir, temporary_windows_drive
):
ret = main(["config", "cache.dir", temporary_windows_drive])
assert ret == 0
tests/func/test_commit.py
+23 -23
View File
@@ -4,51 +4,51 @@ from dvc.utils.stage import load_stage_file, dump_stage_file
from dvc.stage import StageCommitError
def test_commit_recursive(dvc, repo_dir):
stages = dvc.add(repo_dir.DATA_DIR, recursive=True, no_commit=True)
def test_commit_recursive(dvc_repo, repo_dir):
stages = dvc_repo.add(repo_dir.DATA_DIR, recursive=True, no_commit=True)
assert len(stages) == 2
assert dvc.status() != {}
assert dvc_repo.status() != {}
dvc.commit(repo_dir.DATA_DIR, recursive=True)
dvc_repo.commit(repo_dir.DATA_DIR, recursive=True)
assert dvc.status() == {}
assert dvc_repo.status() == {}
def test_commit_force(dvc, repo_dir):
stages = dvc.add(repo_dir.FOO, no_commit=True)
def test_commit_force(dvc_repo, repo_dir):
stages = dvc_repo.add(repo_dir.FOO, no_commit=True)
assert len(stages) == 1
stage = stages[0]
with dvc.state:
with dvc_repo.state:
assert stage.outs[0].changed_cache()
with open(repo_dir.FOO, "a") as fobj:
fobj.write(repo_dir.FOO_CONTENTS)
with dvc.state:
with dvc_repo.state:
assert stage.outs[0].changed_cache()
with pytest.raises(StageCommitError):
dvc.commit(stage.path)
dvc_repo.commit(stage.path)
with dvc.state:
with dvc_repo.state:
assert stage.outs[0].changed_cache()
dvc.commit(stage.path, force=True)
dvc_repo.commit(stage.path, force=True)
assert dvc.status(stage.path) == {}
assert dvc_repo.status(stage.path) == {}
def test_commit_with_deps(dvc, repo_dir):
stages = dvc.add(repo_dir.FOO, no_commit=True)
def test_commit_with_deps(dvc_repo, repo_dir):
stages = dvc_repo.add(repo_dir.FOO, no_commit=True)
assert len(stages) == 1
foo_stage = stages[0]
assert foo_stage is not None
assert len(foo_stage.outs) == 1
fname = "file"
stage = dvc.run(
stage = dvc_repo.run(
cmd="python {} {} {}".format(repo_dir.CODE, repo_dir.FOO, fname),
outs=[fname],
deps=[repo_dir.FOO, repo_dir.CODE],
@@ -57,18 +57,18 @@ def test_commit_with_deps(dvc, repo_dir):
assert stage is not None
assert len(stage.outs) == 1
with dvc.state:
with dvc_repo.state:
assert foo_stage.outs[0].changed_cache()
assert stage.outs[0].changed_cache()
dvc.commit(stage.path, with_deps=True)
with dvc.state:
dvc_repo.commit(stage.path, with_deps=True)
with dvc_repo.state:
assert not foo_stage.outs[0].changed_cache()
assert not stage.outs[0].changed_cache()
def test_commit_changed_md5(dvc, repo_dir):
stages = dvc.add(repo_dir.FOO, no_commit=True)
def test_commit_changed_md5(dvc_repo, repo_dir):
stages = dvc_repo.add(repo_dir.FOO, no_commit=True)
assert len(stages) == 1
stage = stages[0]
@@ -77,6 +77,6 @@ def test_commit_changed_md5(dvc, repo_dir):
dump_stage_file(stage.path, stage_file_content)
with pytest.raises(StageCommitError):
dvc.commit(stage.path)
dvc_repo.commit(stage.path)
dvc.commit(stage.path, force=True)
dvc_repo.commit(stage.path, force=True)
tests/func/test_dependency.py
+2 -2
View File
@@ -17,5 +17,5 @@ def _get_dep(dvc, path):
@pytest.mark.parametrize("url,scheme", TESTS)
def test_scheme(dvc, url, scheme):
assert type(_get_dep(dvc, url)) == DEP_MAP[scheme]
def test_scheme(dvc_repo, url, scheme):
assert type(_get_dep(dvc_repo, url)) == DEP_MAP[scheme]
tests/func/test_install.py
+15 -15
View File
@@ -15,7 +15,7 @@ class TestInstall(object):
def _hook(self, name):
return os.path.join(".git", "hooks", name)
def test_should_create_hooks(self, dvc):
def test_should_create_hooks(self, dvc_repo):
assert main(["install"]) == 0
hooks_with_commands = [
@@ -30,7 +30,7 @@ class TestInstall(object):
with open(self._hook(fname), "r") as fobj:
assert command in fobj.read()
def test_should_append_hooks_if_file_already_exists(self, dvc):
def test_should_append_hooks_if_file_already_exists(self, dvc_repo):
with open(self._hook("post-checkout"), "w") as fobj:
fobj.write("#!/bin/sh\n" "echo hello\n")
@@ -41,7 +41,7 @@ class TestInstall(object):
with open(self._hook("post-checkout"), "r") as fobj:
assert fobj.read() == expected_script
def test_should_be_idempotent(self, dvc):
def test_should_be_idempotent(self, dvc_repo):
assert main(["install"]) == 0
assert main(["install"]) == 0
@@ -50,21 +50,21 @@ class TestInstall(object):
with open(self._hook("post-checkout"), "r") as fobj:
assert fobj.read() == expected_script
def test_should_post_checkout_hook_checkout(self, repo_dir, dvc):
def test_should_post_checkout_hook_checkout(self, repo_dir, dvc_repo):
assert main(["install"]) == 0
stage_file = repo_dir.FOO + Stage.STAGE_FILE_SUFFIX
dvc.add(repo_dir.FOO)
dvc.scm.add([".gitignore", stage_file])
dvc.scm.commit("add")
dvc_repo.add(repo_dir.FOO)
dvc_repo.scm.add([".gitignore", stage_file])
dvc_repo.scm.commit("add")
os.unlink(repo_dir.FOO)
dvc.scm.checkout("new_branc", create_new=True)
dvc_repo.scm.checkout("new_branc", create_new=True)
assert os.path.isfile(repo_dir.FOO)
def test_should_pre_push_hook_push(self, repo_dir, dvc):
def test_should_pre_push_hook_push(self, repo_dir, dvc_repo):
assert main(["install"]) == 0
temp = repo_dir.mkdtemp()
@@ -72,7 +72,7 @@ class TestInstall(object):
storage_path = os.path.join(temp, "dvc_storage")
foo_checksum = file_md5(repo_dir.FOO)[0]
expected_cache_path = dvc.cache.local.get(foo_checksum)
expected_cache_path = dvc_repo.cache.local.get(foo_checksum)
ret = main(["remote", "add", "-d", "store", storage_path])
assert ret == 0
@@ -81,12 +81,12 @@ class TestInstall(object):
assert ret == 0
stage_file = repo_dir.FOO + Stage.STAGE_FILE_SUFFIX
dvc.scm.git.index.add([stage_file, ".gitignore"])
dvc.scm.git.index.commit("commit message")
dvc_repo.scm.git.index.add([stage_file, ".gitignore"])
dvc_repo.scm.git.index.commit("commit message")
dvc.scm.git.clone(git_remote)
dvc.scm.git.create_remote("origin", git_remote)
dvc_repo.scm.git.clone(git_remote)
dvc_repo.scm.git.create_remote("origin", git_remote)
dvc.scm.git.git.push("origin", "master")
dvc_repo.scm.git.git.push("origin", "master")
assert os.path.isfile(expected_cache_path)
tests/func/test_metrics.py
+4 -4
View File
@@ -807,16 +807,16 @@ class TestShouldDisplayMetricsEvenIfMetricIsMissing(object):
self._commit_metric(dvc, "master")
def test(self, dvc, caplog):
self.setUp(dvc)
def test(self, dvc_repo, caplog):
self.setUp(dvc_repo)
dvc.scm.checkout(self.BRANCH_MISSING_METRIC)
dvc_repo.scm.checkout(self.BRANCH_MISSING_METRIC)
self._write_metric()
ret = main(["run", "-M", self.METRIC_FILE])
assert 0 == ret
self._commit_metric(dvc, self.BRANCH_MISSING_METRIC)
self._commit_metric(dvc_repo, self.BRANCH_MISSING_METRIC)
os.remove(self.METRIC_FILE)
ret = main(["metrics", "show", "-a"])
tests/func/test_output.py
+2 -2
View File
@@ -25,5 +25,5 @@ def _get_out(dvc, path):
@pytest.mark.parametrize("url,scheme", TESTS)
def test_scheme(dvc, url, scheme):
assert type(_get_out(dvc, url)) == OUTS_MAP[scheme]
def test_scheme(dvc_repo, url, scheme):
assert type(_get_out(dvc_repo, url)) == OUTS_MAP[scheme]
tests/func/test_remote.py
+7 -7
View File
@@ -174,7 +174,7 @@ class TestRemoteShouldHandleUppercaseRemoteName(TestDvc):
self.assertEqual(ret, 0)
def test_large_dir_progress(repo_dir, dvc):
def test_large_dir_progress(repo_dir, dvc_repo):
from dvc.utils import LARGE_DIR_SIZE
from dvc.progress import progress
@@ -183,12 +183,12 @@ def test_large_dir_progress(repo_dir, dvc):
repo_dir.create(os.path.join("gen", "{}.txt".format(i)), str(i))
with patch.object(progress, "update_target") as update_target:
dvc.add("gen")
dvc_repo.add("gen")
assert update_target.called
def test_dir_checksum_should_be_key_order_agnostic(dvc):
data_dir = os.path.join(dvc.root_dir, "data")
def test_dir_checksum_should_be_key_order_agnostic(dvc_repo):
data_dir = os.path.join(dvc_repo.root_dir, "data")
file1 = os.path.join(data_dir, "1")
file2 = os.path.join(data_dir, "2")
@@ -200,7 +200,7 @@ def test_dir_checksum_should_be_key_order_agnostic(dvc):
fobj.write("2")
path_info = PathLOCAL(path=data_dir)
with dvc.state:
with dvc_repo.state:
with patch.object(
RemoteBASE,
"_collect_dir",
@@ -209,7 +209,7 @@ def test_dir_checksum_should_be_key_order_agnostic(dvc):
{"relpath": "2", "md5": "2"},
],
):
checksum1 = dvc.cache.local.get_dir_checksum(path_info)
checksum1 = dvc_repo.cache.local.get_dir_checksum(path_info)
with patch.object(
RemoteBASE,
@@ -219,6 +219,6 @@ def test_dir_checksum_should_be_key_order_agnostic(dvc):
{"md5": "2", "relpath": "2"},
],
):
checksum2 = dvc.cache.local.get_dir_checksum(path_info)
checksum2 = dvc_repo.cache.local.get_dir_checksum(path_info)
assert checksum1 == checksum2
tests/func/test_repro.py
+6 -6
View File
@@ -1371,15 +1371,15 @@ class TestShouldDisplayMetricsOnReproWithMetricsOption(TestDvc):
@pytest.fixture
def foo_copy(repo_dir, dvc):
stages = dvc.add(repo_dir.FOO)
def foo_copy(repo_dir, dvc_repo):
stages = dvc_repo.add(repo_dir.FOO)
assert len(stages) == 1
foo_stage = stages[0]
assert foo_stage is not None
fname = "foo_copy"
stage_fname = fname + ".dvc"
dvc.run(
dvc_repo.run(
fname=stage_fname,
outs=[fname],
deps=[repo_dir.FOO, repo_dir.CODE],
@@ -1388,8 +1388,8 @@ def foo_copy(repo_dir, dvc):
return {"fname": fname, "stage_fname": stage_fname}
def test_dvc_formatting_retained(dvc, foo_copy):
root = Path(dvc.root_dir)
def test_dvc_formatting_retained(dvc_repo, foo_copy):
root = Path(dvc_repo.root_dir)
stage_file = root / foo_copy["stage_fname"]
# Add comments and custom formatting to stage file
@@ -1400,7 +1400,7 @@ def test_dvc_formatting_retained(dvc, foo_copy):
# Rewrite data source and repro
(root / "foo").write_text("new_foo")
dvc.reproduce(foo_copy["stage_fname"])
dvc_repo.reproduce(foo_copy["stage_fname"])
# All differences should be only about md5
assert _hide_md5(stage_text) == _hide_md5(stage_file.read_text())
tests/func/test_stage.py
+6 -6
View File
@@ -159,18 +159,18 @@ class TestExternalRemoteResolution(TestDvc):
assert os.path.exists("movie.txt")
def test_md5_ignores_comments(repo_dir, dvc):
stage, = dvc.add("foo")
def test_md5_ignores_comments(repo_dir, dvc_repo):
stage, = dvc_repo.add("foo")
with open(stage.path, "a") as f:
f.write("# End comment\n")
new_stage = Stage.load(dvc, stage.path)
new_stage = Stage.load(dvc_repo, stage.path)
assert not new_stage.changed_md5()
def test_meta_is_preserved(dvc):
stage, = dvc.add("foo")
def test_meta_is_preserved(dvc_repo):
stage, = dvc_repo.add("foo")
# Add meta to stage file
data = load_stage_file(stage.path)
@@ -178,7 +178,7 @@ def test_meta_is_preserved(dvc):
dump_stage_file(stage.path, data)
# Loading and dumping to test that it works and meta is retained
new_stage = Stage.load(dvc, stage.path)
new_stage = Stage.load(dvc_repo, stage.path)
new_stage.dump()
new_data = load_stage_file(stage.path)
tests/unit/command/test_repro.py
+2 -2
View File
@@ -14,14 +14,14 @@ default_arguments = {
}
def test_default_arguments(dvc, mocker):
def test_default_arguments(dvc_repo, mocker):
cmd = CmdRepro(parse_args(["repro"]))
mocker.patch.object(cmd.repo, "reproduce")
cmd.run()
cmd.repo.reproduce.assert_called_with("Dvcfile", **default_arguments)
def test_downstream(dvc, mocker):
def test_downstream(dvc_repo, mocker):
cmd = CmdRepro(parse_args(["repro", "--downstream"]))
mocker.patch.object(cmd.repo, "reproduce")
cmd.run()
tests/unit/command/test_version.py
+1 -1
View File
@@ -4,7 +4,7 @@ from dvc.command.version import CmdVersion
from dvc.cli import parse_args
def test_run_in_repo(repo_dir, dvc):
def test_run_in_repo(repo_dir, dvc_repo):
cmd = CmdVersion(parse_args(["version"]))
ret = cmd.run_cmd()
assert ret == 0