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

tests: use shallow=False with filecmp.cmp()

Browse Source 
Signed-off-by: Ruslan Kuprieiev <[email protected]>
This commit is contained in:
Ruslan Kuprieiev
2018-08-05 00:52:29 +03:00
parent aab04a22ad
commit f5bb3e4501
6 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/test_add.py
-1
View File
@@ -1,7 +1,6 @@
import os
import stat
import shutil
import filecmp
from dvc.main import main
from dvc.utils import file_md5
tests/test_checkout.py
+1 -1
View File
@@ -32,7 +32,7 @@ class TestCheckout(TestRepro):
def _test_checkout(self):
self.assertTrue(os.path.isfile(self.FOO))
self.assertTrue(filecmp.cmp(self.FOO, self.orig))
self.assertTrue(filecmp.cmp(self.FOO, self.orig, shallow=False))
class TestCheckoutSingleStage(TestCheckout):
tests/test_import.py
-1
View File
@@ -1,7 +1,6 @@
import os
import stat
import shutil
import filecmp
from dvc.main import main
from dvc.command.imp import CmdImport
tests/test_repro.py
+16 -16
View File
@@ -61,7 +61,7 @@ class TestReproDepUnderDir(TestDvc):
deps=[self.DATA, self.CODE],
cmd='python {} {} {}'.format(self.CODE, self.DATA, self.file1))
self.assertTrue(filecmp.cmp(self.file1, self.DATA))
self.assertTrue(filecmp.cmp(self.file1, self.DATA, shallow=False))
os.unlink(self.DATA)
shutil.copyfile(self.FOO, self.DATA)
@@ -70,7 +70,7 @@ class TestReproDepUnderDir(TestDvc):
stages = self.dvc.reproduce(self.file1_stage)
self.assertEqual(len(stages), 2)
self.assertTrue(filecmp.cmp(self.file1, self.FOO))
self.assertTrue(filecmp.cmp(self.file1, self.FOO, shallow=False))
class TestReproNoDeps(TestRepro):
@@ -101,7 +101,7 @@ class TestReproChangedCode(TestRepro):
stages = self.dvc.reproduce(self.file1_stage)
self.assertTrue(filecmp.cmp(self.file1, self.BAR))
self.assertTrue(filecmp.cmp(self.file1, self.BAR, shallow=False))
self.assertEqual(len(stages), 1)
def swap_code(self):
@@ -117,7 +117,7 @@ class TestReproChangedData(TestRepro):
stages = self.dvc.reproduce(self.file1_stage)
self.assertTrue(filecmp.cmp(self.file1, self.BAR))
self.assertTrue(filecmp.cmp(self.file1, self.BAR, shallow=False))
self.assertEqual(len(stages), 2)
def swap_foo_with_bar(self):
@@ -132,10 +132,10 @@ class TestReproDry(TestReproChangedData):
stages = self.dvc.reproduce(self.file1_stage, dry=True)
self.assertTrue(len(stages), 2)
self.assertFalse(filecmp.cmp(self.file1, self.BAR))
self.assertFalse(filecmp.cmp(self.file1, self.BAR, shallow=False))
ret = main(['repro', '--dry'])
self.assertFalse(filecmp.cmp(self.file1, self.BAR))
self.assertFalse(filecmp.cmp(self.file1, self.BAR, shallow=False))
class TestReproChangedDeepData(TestReproChangedData):
@@ -151,8 +151,8 @@ class TestReproChangedDeepData(TestReproChangedData):
stages = self.dvc.reproduce(file2_stage)
self.assertTrue(filecmp.cmp(self.file1, self.BAR))
self.assertTrue(filecmp.cmp(file2, self.BAR))
self.assertTrue(filecmp.cmp(self.file1, self.BAR, shallow=False))
self.assertTrue(filecmp.cmp(file2, self.BAR, shallow=False))
self.assertEqual(len(stages), 3)
@@ -175,8 +175,8 @@ class TestReproLocked(TestReproChangedData):
ret = main(['unlock', file2_stage])
self.assertEqual(ret, 0)
stages = self.dvc.reproduce(file2_stage)
self.assertTrue(filecmp.cmp(self.file1, self.BAR))
self.assertTrue(filecmp.cmp(file2, self.BAR))
self.assertTrue(filecmp.cmp(self.file1, self.BAR, shallow=False))
self.assertTrue(filecmp.cmp(file2, self.BAR, shallow=False))
self.assertEqual(len(stages), 3)
def test_non_existing(self):
@@ -195,7 +195,7 @@ class TestReproPhony(TestReproChangedData):
self.dvc.reproduce(stage.path)
self.assertTrue(filecmp.cmp(self.file1, self.BAR))
self.assertTrue(filecmp.cmp(self.file1, self.BAR, shallow=False))
class TestNonExistingOutput(TestRepro):
@@ -212,7 +212,7 @@ class TestReproDataSource(TestReproChangedData):
stages = self.dvc.reproduce(self.foo_stage.path)
self.assertTrue(filecmp.cmp(self.FOO, self.BAR))
self.assertTrue(filecmp.cmp(self.FOO, self.BAR, shallow=False))
self.assertEqual(stages[0].outs[0].md5, file_md5(self.BAR)[0])
@@ -293,7 +293,7 @@ class TestCmdReproChdir(TestDvc):
self.assertEqual(ret, 0)
self.assertTrue(os.path.isfile(foo))
self.assertTrue(os.path.isfile(bar))
self.assertTrue(filecmp.cmp(foo, bar))
self.assertTrue(filecmp.cmp(foo, bar, shallow=False))
os.unlink(bar)
@@ -302,7 +302,7 @@ class TestCmdReproChdir(TestDvc):
self.assertEqual(ret, 0)
self.assertTrue(os.path.isfile(foo))
self.assertTrue(os.path.isfile(bar))
self.assertTrue(filecmp.cmp(foo, bar))
self.assertTrue(filecmp.cmp(foo, bar, shallow=False))
class TestReproExternalBase(TestDvc):
@@ -361,7 +361,7 @@ class TestReproExternalBase(TestDvc):
import_stage = self.dvc.imp(out_foo_path, 'import')
self.assertTrue(os.path.exists('import'))
self.assertTrue(filecmp.cmp('import', self.FOO))
self.assertTrue(filecmp.cmp('import', self.FOO, shallow=False))
import_remote_stage = self.dvc.imp(out_foo_path, out_foo_path + '_imported')
@@ -376,7 +376,7 @@ class TestReproExternalBase(TestDvc):
stages = self.dvc.reproduce(import_stage.path)
self.assertEqual(len(stages), 1)
self.assertTrue(os.path.exists('import'))
self.assertTrue(filecmp.cmp('import', self.BAR))
self.assertTrue(filecmp.cmp('import', self.BAR, shallow=False))
stages = self.dvc.reproduce(cmd_stage.path)
self.assertEqual(len(stages), 1)
tests/test_run.py
+2 -2
View File
@@ -26,7 +26,7 @@ class TestRun(TestDvc):
fname=fname,
cwd=cwd)
self.assertTrue(filecmp.cmp(self.FOO, 'out'))
self.assertTrue(filecmp.cmp(self.FOO, 'out', shallow=False))
self.assertTrue(os.path.isfile(stage.path))
self.assertEqual(stage.cmd, cmd)
self.assertEqual(len(stage.deps), len(deps))
@@ -64,7 +64,7 @@ class TestCmdRun(TestDvc):
self.assertEqual(ret, 0)
self.assertTrue(os.path.isfile('out'))
self.assertTrue(os.path.isfile('out.dvc'))
self.assertTrue(filecmp.cmp(self.FOO, 'out'))
self.assertTrue(filecmp.cmp(self.FOO, 'out', shallow=False))
def test_run_bad_command(self):
ret = main(['run',
tests/test_utils.py
+2 -2
View File
@@ -18,10 +18,10 @@ class TestUtils(TestDvc):
os.mkdir(dest_dir)
utils.copyfile(src, dest)
self.assertTrue(filecmp.cmp(src, dest))
self.assertTrue(filecmp.cmp(src, dest, shallow=False))
utils.copyfile(src, dest_dir)
self.assertTrue(filecmp.cmp(src, '{}/{}'.format(dest_dir, src)))
self.assertTrue(filecmp.cmp(src, '{}/{}'.format(dest_dir, src), shallow=False))
shutil.rmtree(dest_dir)
os.remove(src)