mirror of
https://github.com/Stone-Red-Code/dvc.git
synced 2026-11-02 07:18:25 +01:00
Alexander Schepanovski
0c867399bb
* test: remove never used copy of load_stage_file() * dvc: save comments and custom formatting in stage files * Add a couple of TODOs * test: test repro doesn't clear comments and formatting in .dvc As part of this I started writing pytest-like tests and added commonly used fixtures. * test: simplify and prettify dvc formatting retained test Also test that line comments after md5 fields are retained. * test: fix tests * dvc: fix stage and metrics opens not closed * dvc: always use utf-8 in stage files It used to encode in system default encoding. Not sure if PyYAML was handling this silently or we were just lucky all the way. * test: unit test apply_diff() * test: remove TODOs and ASK * dvc: polish dvc-formatting PR * dvc: move stage load/dump utils to a new stage utils file * dvc: clean up apply_diff() * test: test stage md5 ignores comments * test: remove pytests starting marker
189 lines
6.0 KiB
Python
189 lines
6.0 KiB
Python
import os
|
|
|
|
from dvc.main import main
|
|
from dvc.exceptions import DvcException, MoveNotDataSourceError
|
|
from dvc.stage import Stage
|
|
from dvc.utils.stage import load_stage_file
|
|
|
|
from tests.basic_env import TestDvc
|
|
from tests.func.test_repro import TestRepro
|
|
from tests.utils import cd
|
|
|
|
|
|
class TestMove(TestDvc):
|
|
def test(self):
|
|
dst = self.FOO + "1"
|
|
self.dvc.add(self.FOO)
|
|
self.dvc.move(self.FOO, dst)
|
|
|
|
self.assertFalse(os.path.isfile(self.FOO))
|
|
self.assertTrue(os.path.isfile(dst))
|
|
|
|
|
|
class TestMoveNonExistentFile(TestDvc):
|
|
def test(self):
|
|
with self.assertRaises(DvcException):
|
|
self.dvc.move("non_existent_file", "dst")
|
|
|
|
|
|
class TestMoveDirectory(TestDvc):
|
|
def test(self):
|
|
dst = "dst"
|
|
stages = self.dvc.add(self.DATA_DIR)
|
|
self.assertEqual(len(stages), 1)
|
|
self.assertTrue(stages[0] is not None)
|
|
self.dvc.move(self.DATA_DIR, dst)
|
|
self.assertFalse(os.path.exists(self.DATA_DIR))
|
|
self.assertTrue(os.path.exists(dst))
|
|
|
|
|
|
class TestCmdMove(TestDvc):
|
|
def test(self):
|
|
stages = self.dvc.add(self.FOO)
|
|
self.assertEqual(len(stages), 1)
|
|
self.assertTrue(stages[0] is not None)
|
|
|
|
ret = main(["move", self.FOO, self.FOO + "1"])
|
|
self.assertEqual(ret, 0)
|
|
|
|
ret = main(["move", "non-existing-file", "dst"])
|
|
self.assertNotEqual(ret, 0)
|
|
|
|
|
|
class TestMoveNotDataSource(TestRepro):
|
|
def test(self):
|
|
from dvc.repo import Repo as DvcRepo
|
|
|
|
self.dvc = DvcRepo(self._root_dir)
|
|
with self.assertRaises(MoveNotDataSourceError):
|
|
self.dvc.move(self.file1, "dst")
|
|
|
|
ret = main(["move", self.file1, "dst"])
|
|
self.assertNotEqual(ret, 0)
|
|
|
|
|
|
class TestMoveFileWithExtension(TestDvc):
|
|
def test(self):
|
|
with open(os.path.join(self.dvc.root_dir, "file.csv"), "w") as fd:
|
|
fd.write("1,2,3\n")
|
|
|
|
self.dvc.add("file.csv")
|
|
|
|
self.assertTrue(os.path.exists("file.csv"))
|
|
self.assertTrue(os.path.exists("file.csv.dvc"))
|
|
|
|
ret = main(["move", "file.csv", "other_name.csv"])
|
|
self.assertEqual(ret, 0)
|
|
|
|
self.assertFalse(os.path.exists("file.csv"))
|
|
self.assertFalse(os.path.exists("file.csv.dvc"))
|
|
self.assertTrue(os.path.exists("other_name.csv"))
|
|
self.assertTrue(os.path.exists("other_name.csv.dvc"))
|
|
|
|
|
|
class TestMoveFileToDirectory(TestDvc):
|
|
def test(self):
|
|
foo_dvc_file = self.FOO + Stage.STAGE_FILE_SUFFIX
|
|
ret = main(["add", self.FOO])
|
|
self.assertEqual(ret, 0)
|
|
self.assertTrue(os.path.exists(foo_dvc_file))
|
|
|
|
new_foo_path = os.path.join(self.DATA_DIR, self.FOO)
|
|
new_foo_dvc_path = new_foo_path + Stage.STAGE_FILE_SUFFIX
|
|
ret = main(["move", self.FOO, new_foo_path])
|
|
self.assertEqual(ret, 0)
|
|
|
|
self.assertFalse(os.path.exists(self.FOO))
|
|
self.assertFalse(os.path.exists(foo_dvc_file))
|
|
self.assertTrue(os.path.exists(new_foo_path))
|
|
self.assertTrue(os.path.exists(new_foo_dvc_path))
|
|
|
|
|
|
class TestMoveFileToDirectoryWithoutSpecifiedTargetName(TestDvc):
|
|
def test(self):
|
|
foo_stage_file_path = self.FOO + Stage.STAGE_FILE_SUFFIX
|
|
ret = main(["add", self.FOO])
|
|
self.assertEqual(ret, 0)
|
|
self.assertTrue(os.path.exists(foo_stage_file_path))
|
|
|
|
target_foo_path = os.path.join(self.DATA_DIR, self.FOO)
|
|
target_foo_stage_file_path = target_foo_path + Stage.STAGE_FILE_SUFFIX
|
|
|
|
ret = main(["move", self.FOO, self.DATA_DIR])
|
|
self.assertEqual(ret, 0)
|
|
|
|
self.assertFalse(os.path.exists(self.FOO))
|
|
self.assertFalse(os.path.exists(foo_stage_file_path))
|
|
|
|
self.assertTrue(os.path.exists(target_foo_path))
|
|
self.assertTrue(os.path.exists(target_foo_stage_file_path))
|
|
|
|
new_stage = load_stage_file(target_foo_stage_file_path)
|
|
self.assertEqual(self.FOO, new_stage["outs"][0]["path"])
|
|
|
|
|
|
class TestMoveDirectoryShouldNotOverwriteExisting(TestDvc):
|
|
def test(self):
|
|
new_dir_name = "data_dir2"
|
|
os.mkdir(new_dir_name)
|
|
ret = main(["add", self.DATA_DIR])
|
|
self.assertEqual(ret, 0)
|
|
|
|
ret = main(["move", self.DATA_DIR, new_dir_name])
|
|
self.assertEqual(ret, 0)
|
|
|
|
self.assertFalse(os.path.exists(self.DATA_DIR))
|
|
self.assertFalse(
|
|
os.path.exists(self.DATA_DIR + Stage.STAGE_FILE_SUFFIX)
|
|
)
|
|
|
|
self.assertTrue(os.path.exists(new_dir_name))
|
|
self.assertTrue(os.path.isfile(new_dir_name + Stage.STAGE_FILE_SUFFIX))
|
|
|
|
self.assertEqual(os.listdir(new_dir_name), [self.DATA_DIR])
|
|
|
|
|
|
class TestMoveFileBetweenDirectories(TestDvc):
|
|
def test(self):
|
|
data_stage_file = self.DATA + Stage.STAGE_FILE_SUFFIX
|
|
ret = main(["add", self.DATA])
|
|
self.assertEqual(ret, 0)
|
|
self.assertTrue(os.path.exists(data_stage_file))
|
|
|
|
new_data_dir = "data_dir2"
|
|
os.makedirs(new_data_dir)
|
|
|
|
ret = main(["move", self.DATA, new_data_dir])
|
|
self.assertEqual(ret, 0)
|
|
|
|
new_data_path = os.path.join(new_data_dir, os.path.basename(self.DATA))
|
|
new_data_stage_file = new_data_path + Stage.STAGE_FILE_SUFFIX
|
|
|
|
self.assertFalse(os.path.exists(self.DATA))
|
|
self.assertFalse(os.path.exists(data_stage_file))
|
|
|
|
self.assertTrue(os.path.exists(new_data_path))
|
|
self.assertTrue(os.path.exists(new_data_stage_file))
|
|
|
|
new_stage_file = load_stage_file(new_data_stage_file)
|
|
self.assertEqual(
|
|
os.path.basename(self.DATA), new_stage_file["outs"][0]["path"]
|
|
)
|
|
|
|
|
|
class TestMoveFileInsideDirectory(TestDvc):
|
|
def test(self):
|
|
ret = main(["add", self.DATA])
|
|
self.assertEqual(ret, 0)
|
|
|
|
with cd(self.DATA_DIR):
|
|
ret = main(["move", os.path.basename(self.DATA), "data.txt"])
|
|
self.assertEqual(ret, 0)
|
|
|
|
self.assertFalse(os.path.exists(self.DATA))
|
|
|
|
data_fullpath = os.path.join(self.DATA_DIR, "data.txt")
|
|
dvc_fullpath = os.path.join(self.DATA_DIR, "data.txt.dvc")
|
|
self.assertTrue(os.path.exists(data_fullpath))
|
|
self.assertTrue(os.path.exists(dvc_fullpath))
|