tests: use pytest-lazyfixture (#4089)

iterative · Jun 23, 2020 · 7d45a55 · 7d45a55
1 parent 4181c0e
commit 7d45a55
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/tests/func/test_data_cloud.py b/tests/func/test_data_cloud.py
@@ -285,9 +285,10 @@ def test_verify_hashes(
 
 
 @flaky(max_runs=3, min_passes=1)
-@pytest.mark.parametrize("erepo", ["git_dir", "erepo_dir"])
-def test_pull_git_imports(request, tmp_dir, dvc, scm, erepo):
-    erepo = request.getfixturevalue(erepo)
+@pytest.mark.parametrize(
+    "erepo", [pytest.lazy_fixture("git_dir"), pytest.lazy_fixture("erepo_dir")]
+)
+def test_pull_git_imports(tmp_dir, dvc, scm, erepo):
     with erepo.chdir():
         erepo.scm_gen({"dir": {"bar": "bar"}}, commit="second")
         erepo.scm_gen("foo", "foo", commit="first")

diff --git a/tests/func/test_get.py b/tests/func/test_get.py
@@ -33,32 +33,34 @@ def test_get_repo_dir(tmp_dir, erepo_dir):
     trees_equal(erepo_dir / "dir", "dir_imported")
 
 
-@pytest.mark.parametrize("repo_type", ["git_dir", "erepo_dir"])
-def test_get_git_file(request, tmp_dir, repo_type):
-    erepo_dir = request.getfixturevalue(repo_type)
+@pytest.mark.parametrize(
+    "erepo", [pytest.lazy_fixture("git_dir"), pytest.lazy_fixture("erepo_dir")]
+)
+def test_get_git_file(tmp_dir, erepo):
     src = "some_file"
     dst = "some_file_imported"
 
-    erepo_dir.scm_gen({src: "hello"}, commit="add a regular file")
+    erepo.scm_gen({src: "hello"}, commit="add a regular file")
 
-    Repo.get(os.fspath(erepo_dir), src, dst)
+    Repo.get(os.fspath(erepo), src, dst)
 
     assert (tmp_dir / dst).is_file()
     assert (tmp_dir / dst).read_text() == "hello"
 
 
-@pytest.mark.parametrize("repo_type", ["git_dir", "erepo_dir"])
-def test_get_git_dir(request, tmp_dir, repo_type):
-    erepo_dir = request.getfixturevalue(repo_type)
+@pytest.mark.parametrize(
+    "erepo", [pytest.lazy_fixture("git_dir"), pytest.lazy_fixture("erepo_dir")]
+)
+def test_get_git_dir(tmp_dir, erepo):
     src = "some_directory"
     dst = "some_directory_imported"
 
-    erepo_dir.scm_gen({src: {"file.txt": "hello"}}, commit="add a regular dir")
+    erepo.scm_gen({src: {"file.txt": "hello"}}, commit="add a regular dir")
 
-    Repo.get(os.fspath(erepo_dir), src, dst)
+    Repo.get(os.fspath(erepo), src, dst)
 
     assert (tmp_dir / dst).is_dir()
-    trees_equal(erepo_dir / src, tmp_dir / dst)
+    trees_equal(erepo / src, tmp_dir / dst)
 
 
 def test_cache_type_is_properly_overridden(tmp_dir, erepo_dir):