From 79902988fcead014e9d532c82c1310085f087707 Mon Sep 17 00:00:00 2001 From: Alexander Schepanovski Date: Sat, 7 Dec 2019 13:17:08 +0100 Subject: [PATCH] test: fix files set comparisons in dvcignore tests under windows --- tests/func/test_ignore.py | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/tests/func/test_ignore.py b/tests/func/test_ignore.py index 84b8af966..b08d57415 100644 --- a/tests/func/test_ignore.py +++ b/tests/func/test_ignore.py @@ -11,27 +11,24 @@ from dvc.utils import walk_files from dvc.utils.compat import fspath from dvc.utils.fs import get_mtime_and_size +from tests.utils import to_posixpath -def test_ignore_in_child_dir(tmp_dir, dvc): + +def test_ignore(tmp_dir, dvc, monkeypatch): tmp_dir.gen({"dir": {"ignored": "text", "other": "text2"}}) tmp_dir.gen(DvcIgnore.DVCIGNORE_FILE, "dir/ignored") - assert set(walk_files("dir", dvc.dvcignore)) == {"dir/other"} - - -def test_ignore_in_parent_dir(tmp_dir, dvc, monkeypatch): - tmp_dir.gen({"dir": {"ignored": "text", "other": "text2"}}) - tmp_dir.gen(DvcIgnore.DVCIGNORE_FILE, "dir/ignored") + assert _files_set("dir", dvc.dvcignore) == {"dir/other"} monkeypatch.chdir("dir") - assert set(walk_files(".", dvc.dvcignore)) == {"./other"} + assert _files_set(".", dvc.dvcignore) == {"./other"} def test_ignore_unicode(tmp_dir, dvc): tmp_dir.gen({"dir": {"тест": "проверка", "other": "text"}}) tmp_dir.gen(DvcIgnore.DVCIGNORE_FILE, "dir/тест") - assert set(walk_files("dir", dvc.dvcignore)) == {"dir/other"} + assert _files_set("dir", dvc.dvcignore) == {"dir/other"} def test_rename_ignored_file(tmp_dir, dvc): @@ -109,7 +106,11 @@ def test_ignore_on_branch(tmp_dir, scm, dvc): tmp_dir.scm_gen(DvcIgnore.DVCIGNORE_FILE, "foo", commit="add ignore") scm.checkout("master") - assert set(walk_files(".", dvc.dvcignore)) == {"./foo", "./bar"} + assert _files_set(".", dvc.dvcignore) == {"./foo", "./bar"} dvc.tree = scm.get_tree("branch") - assert set(walk_files(".", dvc.dvcignore)) == {"./bar"} + assert _files_set(".", dvc.dvcignore) == {"./bar"} + + +def _files_set(root, dvcignore): + return {to_posixpath(f) for f in walk_files(root, dvcignore)}