From 2906a31b66bebd536e15ac3db14d40c8bf470c3e Mon Sep 17 00:00:00 2001 From: "Mr. Outis" Date: Fri, 16 Nov 2018 19:05:53 -0600 Subject: [PATCH] tests: dvc checkout --force --- dvc/project.py | 2 +- tests/test_checkout.py | 32 ++++++++++++++++---------------- tests/test_metrics.py | 2 +- tests/test_repro.py | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dvc/project.py b/dvc/project.py index ac0a86873..69050f029 100644 --- a/dvc/project.py +++ b/dvc/project.py @@ -957,7 +957,7 @@ class Project(object): for fname, t, x in entries: if stage: - self.checkout(stage) + self.checkout(stage, force=True) rel = os.path.relpath(fname) metric = self._read_metric(fname, diff --git a/tests/test_checkout.py b/tests/test_checkout.py index 127a68a44..c42add4a8 100644 --- a/tests/test_checkout.py +++ b/tests/test_checkout.py @@ -36,7 +36,7 @@ class TestCheckout(TestRepro): shutil.rmtree(self.DATA_DIR) def test(self): - self.dvc.checkout() + self.dvc.checkout(force=True) self._test_checkout() def _test_checkout(self): @@ -46,10 +46,10 @@ class TestCheckout(TestRepro): class TestCheckoutSingleStage(TestCheckout): def test(self): - ret = main(['checkout', self.foo_stage.path]) + ret = main(['checkout', '--force', self.foo_stage.path]) self.assertEqual(ret, 0) - ret = main(['checkout', self.data_dir_stage.path]) + ret = main(['checkout', '--force', self.data_dir_stage.path]) self.assertEqual(ret, 0) self._test_checkout() @@ -64,7 +64,7 @@ class TestCheckoutCorruptedCacheFile(TestRepro): with open(cache, 'a') as fd: fd.write('1') - self.dvc.checkout() + self.dvc.checkout(force=True) self.assertFalse(os.path.isfile(self.FOO)) self.assertFalse(os.path.isfile(cache)) @@ -93,14 +93,14 @@ class TestCheckoutCorruptedCacheDir(TestDvc): with open(cache, 'w+') as fobj: fobj.write('1') - self.dvc.checkout() + self.dvc.checkout(force=True) self.assertFalse(os.path.exists(cache)) class TestCmdCheckout(TestCheckout): def test(self): - ret = main(['checkout']) + ret = main(['checkout', '--force']) self.assertEqual(ret, 0) self._test_checkout() @@ -146,7 +146,7 @@ class TestRemoveFilesWhenCheckout(CheckoutBase): # add the file into a separate branch self.dvc.scm.checkout(branch_1, True) - ret = main(['checkout']) + ret = main(['checkout', '--force']) self.assertEqual(ret, 0) self.commit_data_file(fname) @@ -156,7 +156,7 @@ class TestRemoveFilesWhenCheckout(CheckoutBase): # Make sure `dvc checkout` removes the file # self.dvc.checkout() - ret = main(['checkout']) + ret = main(['checkout', '--force']) self.assertEqual(ret, 0) self.assertFalse(os.path.exists(fname)) @@ -217,7 +217,7 @@ class TestCheckoutSelectiveRemove(CheckoutBase): sleep() - ret = main(['checkout', stage.relpath]) + ret = main(['checkout', '--force', stage.relpath]) self.assertEqual(ret, 0) sleep() @@ -269,12 +269,12 @@ class TestGitIgnoreWhenCheckout(CheckoutBase): self.commit_data_file(fname_master) self.dvc.scm.checkout(branch_1, True) - ret = main(['checkout']) + ret = main(['checkout', '--force']) self.assertEqual(ret, 0) self.commit_data_file(fname_branch) self.dvc.scm.checkout(branch_master) - ret = main(['checkout']) + ret = main(['checkout', '--force']) self.assertEqual(ret, 0) ignored = self.read_ignored() @@ -283,7 +283,7 @@ class TestGitIgnoreWhenCheckout(CheckoutBase): self.assertIn('/' + fname_master, ignored) self.dvc.scm.checkout(branch_1) - ret = main(['checkout']) + ret = main(['checkout', '--force']) self.assertEqual(ret, 0) ignored = self.read_ignored() self.assertIn('/' + fname_branch, ignored) @@ -300,7 +300,7 @@ class TestCheckoutMissingMd5InStageFile(TestRepro): with open(self.file1_stage, 'w') as fd: yaml.dump(d, fd) - self.dvc.checkout() + self.dvc.checkout(force=True) class TestCheckoutEmptyDir(TestDvc): @@ -317,7 +317,7 @@ class TestCheckoutEmptyDir(TestDvc): stage.outs[0].remove() self.assertFalse(os.path.exists(dname)) - self.dvc.checkout() + self.dvc.checkout(force=True) self.assertTrue(os.path.isdir(dname)) self.assertEqual(len(os.listdir(dname)), 0) @@ -332,7 +332,7 @@ class TestCheckoutNotCachedFile(TestDvc): deps=[self.FOO, self.CODE], outs_no_cache=['out']) - self.dvc.checkout() + self.dvc.checkout(force=True) class TestCheckoutWithDeps(TestRepro): @@ -343,7 +343,7 @@ class TestCheckoutWithDeps(TestRepro): self.assertFalse(os.path.exists(self.FOO)) self.assertFalse(os.path.exists(self.file1)) - ret = main(['checkout', self.file1_stage, '--with-deps']) + ret = main(['checkout', '--force', self.file1_stage, '--with-deps']) self.assertEqual(ret, 0) self.assertTrue(os.path.exists(self.FOO)) diff --git a/tests/test_metrics.py b/tests/test_metrics.py index 3aa814221..02a7475cf 100644 --- a/tests/test_metrics.py +++ b/tests/test_metrics.py @@ -214,7 +214,7 @@ class TestNoMetrics(TestDvc): class TestCachedMetrics(TestDvc): def _do_write(self, branch): self.dvc.scm.checkout(branch) - self.dvc.checkout() + self.dvc.checkout(force=True) with open('metrics.json', 'w+') as fd: json.dump({'metrics': branch}, fd) diff --git a/tests/test_repro.py b/tests/test_repro.py index 531379726..a1976c08d 100644 --- a/tests/test_repro.py +++ b/tests/test_repro.py @@ -585,7 +585,7 @@ class TestReproExternalBase(TestDvc): self.dvc.gc() self.dvc.remove(cmd_stage.path, outs_only=True) - self.dvc.checkout(cmd_stage.path) + self.dvc.checkout(cmd_stage.path, force=True) class TestReproExternalS3(TestReproExternalBase):