From 945eb181bcb2e949e4865b9e8ce52d50854de545 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Redzy=C5=84ski?= Date: Wed, 8 Jan 2020 11:23:43 +0100 Subject: [PATCH] pipeline: test: migrate to dir helpers --- tests/func/test_pipeline.py | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/tests/func/test_pipeline.py b/tests/func/test_pipeline.py index 312efdddb6..d6420a4173 100644 --- a/tests/func/test_pipeline.py +++ b/tests/func/test_pipeline.py @@ -54,13 +54,13 @@ def test_non_existing(self): self.assertNotEqual(ret, 0) -def test_single_ascii(repo_dir, dvc_repo): - dvc_repo.add(repo_dir.FOO) +def test_single_ascii(tmp_dir, dvc): + tmp_dir.dvc_gen("foo", "foo content") assert main(["pipeline", "show", "--ascii", "foo.dvc"]) == 0 -def test_single_ascii_commands(repo_dir, dvc_repo): - dvc_repo.add(repo_dir.FOO) +def test_single_ascii_commands(tmp_dir, dvc): + tmp_dir.dvc_gen("foo", "foo content") assert main(["pipeline", "show", "--ascii", "foo.dvc", "--commands"]) == 0 @@ -98,10 +98,9 @@ def test_dot_commands(self): self.assertEqual(ret, 0) -def test_print_locked_stages(repo_dir, dvc_repo, caplog): - dvc_repo.add("foo") - dvc_repo.add("bar") - dvc_repo.lock_stage("foo.dvc") +def test_print_locked_stages(tmp_dir, dvc, caplog): + tmp_dir.dvc_gen({"foo": "foo content", "bar": "bar content"}) + dvc.lock_stage("foo.dvc") caplog.clear() with caplog.at_level(logging.INFO, logger="dvc"): @@ -111,13 +110,9 @@ def test_print_locked_stages(repo_dir, dvc_repo, caplog): assert "bar.dvc" not in caplog.text -def test_dot_outs(repo_dir, dvc_repo): - dvc_repo.add(repo_dir.FOO) - dvc_repo.run( - outs=["file"], - deps=[repo_dir.FOO, repo_dir.CODE], - cmd="python {} {} {}".format(repo_dir.CODE, repo_dir.FOO, "file"), - ) +def test_dot_outs(tmp_dir, dvc, run_copy): + tmp_dir.gen("foo", "foo content") + run_copy("foo", "file") assert main(["pipeline", "show", "--dot", "file.dvc", "--outs"]) == 0