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

add more tests for wdir/fname new logic

Browse Source
This commit is contained in:
Ivan Shcheklein
2019-02-28 21:43:14 -08:00
parent 3bd3f47193
commit e26db30f60
8 changed files with 204 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dvc/command/run.py
+1 -3
View File
@@ -147,9 +147,7 @@ def add_parser(subparsers, parent_parser):
"--yes",
action="store_true",
default=False,
help="(OBSOLETED, use --overwrite-dvcfile instead) Automatic 'yes' "
"answer to all prompts. E.g. when '.dvc' file exists and dvc "
"asks if you want to overwrite it.",
help="Deprecated, use --overwrite-dvcfile instead",
)
run_parser.add_argument(
"--overwrite-dvcfile",
dvc/scm/git.py
+2 -1
View File
@@ -75,7 +75,8 @@ class Git(Base):
ignore_list = []
if os.path.exists(gitignore):
ignore_list = open(gitignore, "r").readlines()
with open(gitignore, "r") as f:
ignore_list = f.readlines()
filtered = list(
filter(lambda x: x.strip() == entry.strip(), ignore_list)
)
dvc/stage.py
+12 -2
View File
@@ -74,6 +74,12 @@ class StagePathNotFoundError(DvcException):
super(StagePathNotFoundError, self).__init__(msg.format(path))
class StagePathNotDirectoryError(DvcException):
def __init__(self, path):
msg = "stage working or file path '{}' is not directory"
super(StagePathNotDirectoryError, self).__init__(msg.format(path))
class StageCommitError(DvcException):
pass
@@ -331,11 +337,15 @@ class Stage(object):
def _check_stage_path(repo, path):
assert repo is not None
if not os.path.exists(os.path.realpath(path)):
real_path = os.path.realpath(path)
if not os.path.exists(real_path):
raise StagePathNotFoundError(path)
if not os.path.isdir(real_path):
raise StagePathNotDirectoryError(path)
proj_dir = os.path.realpath(repo.root_dir) + os.path.sep
if not (os.path.realpath(path) + os.path.sep).startswith(proj_dir):
if not (real_path + os.path.sep).startswith(proj_dir):
raise StagePathOutsideError(path)
@property
tests/basic_env.py
+1
View File
@@ -1,6 +1,7 @@
import os
import uuid
import tempfile
from git import Repo
from git.exc import GitCommandNotFound
from unittest import TestCase
tests/test_repro.py
+39 -1
View File
@@ -732,7 +732,7 @@ class TestCmdRepro(TestReproChangedData):
self.assertNotEqual(ret, 0)
class TestCmdReproChdir(TestDvc):
class TestCmdReproChdirCwdBackwardCompatible(TestDvc):
def test(self):
dname = "dir"
os.mkdir(dname)
@@ -770,6 +770,44 @@ class TestCmdReproChdir(TestDvc):
self.assertTrue(filecmp.cmp(foo, bar, shallow=False))
class TestCmdReproChdir(TestDvc):
def test(self):
dname = "dir"
os.mkdir(dname)
foo = os.path.join(dname, self.FOO)
bar = os.path.join(dname, self.BAR)
code = os.path.join(dname, self.CODE)
shutil.copyfile(self.FOO, foo)
shutil.copyfile(self.CODE, code)
ret = main(
[
"run",
"-f",
"{}/Dvcfile".format(dname),
"-w",
"{}".format(dname),
"-d",
self.FOO,
"-o",
self.BAR,
"python {} {} {}".format(self.CODE, self.FOO, self.BAR),
]
)
self.assertEqual(ret, 0)
self.assertTrue(os.path.isfile(foo))
self.assertTrue(os.path.isfile(bar))
self.assertTrue(filecmp.cmp(foo, bar, shallow=False))
os.unlink(bar)
ret = main(["repro", "-c", dname])
self.assertEqual(ret, 0)
self.assertTrue(os.path.isfile(foo))
self.assertTrue(os.path.isfile(bar))
self.assertTrue(filecmp.cmp(foo, bar, shallow=False))
class TestReproExternalBase(TestDvc):
def should_test(self):
return False
tests/test_run.py
+63 -2
View File
@@ -5,11 +5,12 @@ import mock
import shutil
import filecmp
import subprocess
import yaml
from dvc.main import main
from dvc.utils import file_md5
from dvc.system import System
from dvc.stage import Stage, StagePathNotFoundError
from dvc.stage import Stage, StagePathNotFoundError, StagePathNotDirectoryError
from dvc.stage import StageFileBadNameError, MissingDep
from dvc.stage import StagePathOutsideError, StageFileAlreadyExistsError
from dvc.exceptions import (
@@ -242,6 +243,14 @@ class TestRunBadWdir(TestDvc):
path = os.path.join(self._root_dir, str(uuid.uuid4()))
self.dvc.run(cmd="", wdir=path)
def test_not_dir(self):
with self.assertRaises(StagePathNotDirectoryError):
path = os.path.join(self._root_dir, str(uuid.uuid4()))
os.mkdir(path)
path = os.path.join(path, str(uuid.uuid4()))
open(path, "a").close()
self.dvc.run(cmd="", wdir=path)
class TestRunBadName(TestDvc):
def test(self):
@@ -316,7 +325,7 @@ class TestCmdRun(TestDvc):
self.assertEqual(stage.cmd, 'echo "foo bar"')
@mock.patch.object(subprocess, "Popen", side_effect=KeyboardInterrupt)
def test_keyboard_interrupt(self, mock_popen):
def test_keyboard_interrupt(self, _):
ret = main(["run", "mycmd"])
self.assertEqual(ret, 252)
@@ -605,6 +614,58 @@ class TestCmdRunCliMetrics(TestDvc):
self.assertEqual(open("metrics.txt", "r").read().rstrip(), "test")
class TestCmdRunWorkingDirectory(TestDvc):
def test_default_wdir_is_written(self):
stage = self.dvc.run(
cmd="echo test > {}".format(self.FOO), outs=[self.FOO], wdir="."
)
with open(stage.relpath, "r") as fobj:
d = yaml.safe_load(fobj)
self.assertEqual(d[Stage.PARAM_WDIR], ".")
stage = self.dvc.run(
cmd="echo test > {}".format(self.BAR), outs=[self.BAR]
)
with open(stage.relpath, "r") as fobj:
d = yaml.safe_load(fobj)
self.assertEqual(d[Stage.PARAM_WDIR], ".")
def test_fname_changes_path_and_wdir(self):
dname = "dir"
os.mkdir(os.path.join(self._root_dir, dname))
foo = os.path.join(dname, self.FOO)
fname = os.path.join(dname, "stage" + Stage.STAGE_FILE_SUFFIX)
stage = self.dvc.run(
cmd="echo test > {}".format(foo), outs=[foo], fname=fname
)
self.assertEqual(stage.wdir, os.path.realpath(self._root_dir))
self.assertEqual(
stage.path, os.path.join(os.path.realpath(self._root_dir), fname)
)
# Check that it is dumped properly (relative to fname)
with open(stage.relpath, "r") as fobj:
d = yaml.safe_load(fobj)
self.assertEqual(d[Stage.PARAM_WDIR], "..")
def test_cwd_is_ignored(self):
dname = "dir"
os.mkdir(os.path.join(self._root_dir, dname))
foo = os.path.join(dname, self.FOO)
fname = os.path.join("stage" + Stage.STAGE_FILE_SUFFIX)
stage = self.dvc.run(
cmd="echo test > {}".format(foo),
outs=[foo],
cwd=dname,
wdir=".",
fname=fname,
)
self.assertEqual(stage.wdir, os.path.realpath(self._root_dir))
self.assertEqual(
stage.path, os.path.join(os.path.realpath(self._root_dir), fname)
)
class TestRunDeterministicBase(TestDvc):
def setUp(self):
super(TestRunDeterministicBase, self).setUp()
tests/test_stage.py
+23
View File
@@ -1,3 +1,5 @@
import yaml
from dvc.output.local import OutputLOCAL
from dvc.remote.local import RemoteLOCAL
from dvc.stage import Stage, StageFileFormatError
@@ -91,3 +93,24 @@ class TestReload(TestDvc):
d = load_stage_file(stage.relpath)
self.assertEqual(d[stage.PARAM_MD5], md5)
class TestDefaultWorkingDirectory(TestDvc):
def test_ignored_in_checksum(self):
stage = self.dvc.run(
cmd="echo test > {}".format(self.FOO),
deps=[self.BAR],
outs=[self.FOO],
)
with open(stage.relpath, "r") as fobj:
d = yaml.safe_load(fobj)
self.assertEqual(d[stage.PARAM_WDIR], ".")
del d[stage.PARAM_WDIR]
with open(stage.relpath, "w") as fobj:
yaml.safe_dump(d, fobj, default_flow_style=False)
with self.dvc.state:
stage = Stage.load(self.dvc, stage.relpath)
self.assertFalse(stage.changed())
tests/unit/command/run.py
+63
View File
@@ -0,0 +1,63 @@
import mock
from unittest import TestCase
from dvc.main import main
class TestCli(TestCase):
@mock.patch("dvc.main.Analytics", autospec=True)
@mock.patch("dvc.cli.run.CmdRun", autospec=True)
def test_file_name(self, cmd_mock, _):
cmd_mock.return_value.run_cmd.return_value = 0
ret = main(["run", "-f", "test/out.dvc", "echo"])
self.assertEqual(ret, 0)
cmd_mock.assert_called_once()
args, kwargs = cmd_mock.call_args_list[0]
self.assertEqual(len(args), 1)
self.assertEqual(len(kwargs), 0)
self.assertEqual(args[0].file, "test/out.dvc")
self.assertSequenceEqual(args[0].command, ["echo"])
cmd_mock.return_value.run_cmd.assert_called_once()
@mock.patch("dvc.main.Analytics", autospec=True)
@mock.patch("dvc.cli.run.CmdRun", autospec=True)
def test_file_name_default(self, cmd_mock, _):
cmd_mock.return_value.run_cmd.return_value = 0
ret = main(["run", "-d", "foo", "echo"])
self.assertEqual(ret, 0)
cmd_mock.assert_called_once()
args, kwargs = cmd_mock.call_args_list[0]
self.assertEqual(len(args), 1)
self.assertEqual(len(kwargs), 0)
self.assertIsNone(args[0].file)
self.assertSequenceEqual(args[0].command, ["echo"])
cmd_mock.return_value.run_cmd.assert_called_once()
@mock.patch("dvc.main.Analytics", autospec=True)
@mock.patch("dvc.cli.run.CmdRun", autospec=True)
def test_wdir(self, cmd_mock, _):
cmd_mock.return_value.run_cmd.return_value = 0
ret = main(["run", "--wdir", "test/", "echo"])
self.assertEqual(ret, 0)
cmd_mock.assert_called_once()
args, kwargs = cmd_mock.call_args_list[0]
self.assertEqual(len(args), 1)
self.assertEqual(len(kwargs), 0)
self.assertEqual(args[0].wdir, "test/")
self.assertSequenceEqual(args[0].command, ["echo"])
cmd_mock.return_value.run_cmd.assert_called_once()
@mock.patch("dvc.main.Analytics", autospec=True)
@mock.patch("dvc.cli.run.CmdRun", autospec=True)
def test_wdir_default(self, cmd_mock, _):
cmd_mock.return_value.run_cmd.return_value = 0
ret = main(["run", "echo"])
self.assertEqual(ret, 0)
cmd_mock.assert_called_once()
args, kwargs = cmd_mock.call_args_list[0]
self.assertEqual(len(args), 1)
self.assertEqual(len(kwargs), 0)
self.assertEqual(args[0].wdir, None)
self.assertSequenceEqual(args[0].command, ["echo"])
cmd_mock.return_value.run_cmd.assert_called_once()