mirror of
https://github.com/Stone-Red-Code/dvc.git
synced 2026-11-13 07:18:25 +01:00
Alexander Schepanovski
d80293c44d
Replaced Path* dataclasses with PathInfo/URLInfo/CloudURLInfo, which know how parse, serialize, stringify and join themselves. They also provide useful accessors like part of an url or pathlib.Path like .parent or .name. Along the way two families of bugs where fixed and should never occur in the future: - paths not matched as strings anymore, e.g. using str.startswith() - Output.path is eliminated as ambiguous Both families might had caused undefined surprising behavior when local and remote paths clash.
71 lines
2.4 KiB
Python
71 lines
2.4 KiB
Python
from dvc.main import main
|
|
from dvc.stage import Stage
|
|
from tests.basic_env import TestDvc
|
|
|
|
from dvc.scm.git import GitTree
|
|
from dvc.scm.tree import WorkingTree
|
|
|
|
|
|
class TestCollect(TestDvc):
|
|
def setUp(self):
|
|
super(TestCollect, self).setUp()
|
|
self.dvc.add(self.FOO)
|
|
self.dvc.run(
|
|
deps=[self.FOO],
|
|
outs=[self.BAR],
|
|
cmd="python code.py {} {}".format(self.FOO, self.BAR),
|
|
)
|
|
self.dvc.scm.add([".gitignore", self.FOO + ".dvc", self.BAR + ".dvc"])
|
|
self.dvc.scm.commit("foo.dvc and bar.dvc")
|
|
self.dvc.scm.checkout("new_branch", True)
|
|
self.dvc.run(
|
|
deps=[self.BAR],
|
|
outs=["buzz"],
|
|
cmd="python code.py {} {}".format(self.BAR, "buzz"),
|
|
)
|
|
self.dvc.scm.add([".gitignore", "buzz.dvc"])
|
|
self.dvc.scm.commit("add buzz")
|
|
self.dvc.scm.checkout("master")
|
|
|
|
def _check(self, branch, target, with_deps, expected):
|
|
if branch:
|
|
self.dvc.tree = GitTree(self.dvc.scm.git, branch)
|
|
else:
|
|
self.dvc.tree = WorkingTree()
|
|
result = self.dvc.collect(target + ".dvc", with_deps=with_deps)
|
|
self.assertEqual([[str(j) for j in i.outs] for i in result], expected)
|
|
return result
|
|
|
|
def test(self):
|
|
self._check("", self.BAR, True, [[self.FOO], [self.BAR]])
|
|
self._check("master", self.BAR, True, [[self.FOO], [self.BAR]])
|
|
self._check(
|
|
"new_branch", "buzz", True, [[self.FOO], [self.BAR], ["buzz"]]
|
|
)
|
|
result = self._check("new_branch", "buzz", False, [["buzz"]])
|
|
self.assertEqual([str(i) for i in result[0].deps], ["bar"])
|
|
|
|
|
|
class TestIgnore(TestDvc):
|
|
def _stage_name(self, file):
|
|
return file + Stage.STAGE_FILE_SUFFIX
|
|
|
|
def test_should_not_gather_stage_files_from_ignored_d(self):
|
|
ret = main(["add", self.FOO, self.BAR, self.DATA, self.DATA_SUB])
|
|
self.assertEqual(0, ret)
|
|
|
|
stages = self.dvc.stages()
|
|
self.assertEqual(4, len(stages))
|
|
|
|
with open(".dvcignore", "w") as fobj:
|
|
fobj.write("data_dir")
|
|
|
|
stages = self.dvc.stages()
|
|
self.assertEqual(2, len(stages))
|
|
|
|
stagenames = [s.relpath for s in stages]
|
|
self.assertIn(self._stage_name(self.FOO), stagenames)
|
|
self.assertIn(self._stage_name(self.BAR), stagenames)
|
|
self.assertNotIn(self._stage_name(self.DATA), stagenames)
|
|
self.assertNotIn(self._stage_name(self.DATA_SUB), stagenames)
|