move: move directory into an existing directory

Signed-off-by: Ruslan Kuprieiev <[email protected]>
This commit is contained in:
Ruslan Kuprieiev
2019-04-24 04:56:33 +03:00
parent ee8d9a1312
commit 41b67c3730
2 changed files with 16 additions and 8 deletions
+15 -7
View File
@@ -124,23 +124,31 @@ class TestMoveFileToDirectoryWithoutSpecifiedTargetName(TestDvc):
class TestMoveDirectoryShouldNotOverwriteExisting(TestDvc):
def test(self):
new_dir_name = "data_dir2"
os.mkdir(new_dir_name)
dir_name = "dir"
orig_listdir = set(os.listdir(self.DATA_DIR))
ret = main(["add", self.DATA_DIR])
self.assertEqual(ret, 0)
ret = main(["move", self.DATA_DIR, new_dir_name])
os.mkdir(dir_name)
new_dir_name = os.path.join(dir_name, self.DATA_DIR)
ret = main(["move", self.DATA_DIR, dir_name])
self.assertEqual(ret, 0)
data_dir_stage = self.DATA_DIR + Stage.STAGE_FILE_SUFFIX
self.assertFalse(os.path.exists(self.DATA_DIR))
self.assertFalse(
os.path.exists(self.DATA_DIR + Stage.STAGE_FILE_SUFFIX)
self.assertFalse(os.path.exists(data_dir_stage))
self.assertTrue(os.path.exists(dir_name))
self.assertEqual(
set(os.listdir(dir_name)),
set([".gitignore", data_dir_stage, self.DATA_DIR]),
)
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])
self.assertEqual(set(os.listdir(new_dir_name)), orig_listdir)
class TestMoveFileBetweenDirectories(TestDvc):