From 11d890a4fa85c77f8cebbbdab42eccb9a4b5e51b Mon Sep 17 00:00:00 2001 From: Wojciech Baranowski Date: Fri, 13 Dec 2019 19:15:36 +0200 Subject: [PATCH] Wrap tmp_dir in str() --- tests/func/test_import.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/func/test_import.py b/tests/func/test_import.py index dacaca0f0..cce712f8a 100644 --- a/tests/func/test_import.py +++ b/tests/func/test_import.py @@ -39,8 +39,8 @@ def test_import_git_file(erepo_dir, tmp_dir, dvc, scm): assert (tmp_dir / dst).exists() assert os.path.isfile(str(tmp_dir / dst)) - assert filecmp.cmp(erepo_dir / src, tmp_dir / dst, shallow=False) - assert tmp_dir.scm.repo.git.check_ignore(tmp_dir / dst) + assert filecmp.cmp(str(erepo_dir / src), str(tmp_dir / dst), shallow=False) + assert tmp_dir.scm.repo.git.check_ignore(str(tmp_dir / dst)) def test_import_git_dir(erepo_dir, tmp_dir, dvc, scm): @@ -53,8 +53,8 @@ def test_import_git_dir(erepo_dir, tmp_dir, dvc, scm): assert (tmp_dir / dst).exists() assert os.path.isdir(str(tmp_dir / dst)) - trees_equal(erepo_dir / src, tmp_dir / dst) - assert tmp_dir.scm.repo.git.check_ignore(tmp_dir / dst) + trees_equal(str(erepo_dir / src), str(tmp_dir / dst)) + assert tmp_dir.scm.repo.git.check_ignore(str(tmp_dir / dst)) def test_import_dir(git, dvc_repo, erepo): @@ -86,7 +86,7 @@ def test_import_non_cached(erepo_dir, tmp_dir, dvc, scm): assert (tmp_dir / dst).exists() assert os.path.isfile(str(tmp_dir / dst)) - assert filecmp.cmp(erepo_dir / src, tmp_dir / dst, shallow=False) + assert filecmp.cmp(str(erepo_dir / src), str(tmp_dir / dst), shallow=False) assert tmp_dir.scm.repo.git.check_ignore(dst)