mirror of
https://github.com/Stone-Red-Code/dvc.git
synced 2026-11-06 15:28:28 +01:00
Paweł RedzyńskiandRuslan Kuprieiev
393d926b74
* state: use ignore file handler when accessing metadata * fs: don't add dir size to overall size for dir * ignore: use posix-like path on windows * ignore: remove tree from dvc_walk arguments * ignore: handle DvcIgnoreFilter creation outside of DVC repo * ignore: throw on dvcignore file under output dir, but not dependency dir * ignore: move ignore initialization to Repo init * ignore: work in progress * ignore: work in progress 2 * ignore: throw on .dvcignore upon collecting dir * ignore: refactor * ignore: loading upper level ignores in stages() * Update dvc/repo/__init__.py Co-Authored-By: Ruslan Kuprieiev <[email protected]> * dvcignore review refactor
106 lines
2.8 KiB
Python
106 lines
2.8 KiB
Python
import os
|
|
|
|
import dvc
|
|
import pytest
|
|
from mock import mock_open, patch
|
|
|
|
from dvc.ignore import DvcIgnorePatterns, DvcIgnoreDirs
|
|
|
|
|
|
def mock_dvcignore(dvcignore_path, patterns):
|
|
|
|
with patch.object(
|
|
dvc.ignore, "open", mock_open(read_data="\n".join(patterns))
|
|
):
|
|
ignore_patterns = DvcIgnorePatterns(dvcignore_path)
|
|
|
|
return ignore_patterns
|
|
|
|
|
|
def test_ignore_from_file_should_filter_dirs_and_files():
|
|
dvcignore_path = os.path.join(
|
|
os.path.sep, "full", "path", "to", "ignore", "file", ".dvcignore"
|
|
)
|
|
|
|
patterns = ["dir_to_ignore", "file_to_ignore"]
|
|
|
|
root = os.path.dirname(dvcignore_path)
|
|
dirs = ["dir1", "dir2", "dir_to_ignore"]
|
|
files = ["file1", "file2", "file_to_ignore"]
|
|
|
|
ignore = mock_dvcignore(dvcignore_path, patterns)
|
|
new_dirs, new_files = ignore(root, dirs, files)
|
|
|
|
assert {"dir1", "dir2"} == set(new_dirs)
|
|
assert {"file1", "file2"} == set(new_files)
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"file_to_ignore_relpath, patterns, expected_match",
|
|
[
|
|
("to_ignore", ["to_ignore"], True),
|
|
("to_ignore.txt", ["to_ignore*"], True),
|
|
(
|
|
os.path.join("rel", "p", "p2", "to_ignore"),
|
|
["rel/**/to_ignore"],
|
|
True,
|
|
),
|
|
(
|
|
os.path.join(
|
|
os.path.sep,
|
|
"full",
|
|
"path",
|
|
"to",
|
|
"ignore",
|
|
"file",
|
|
"to_ignore",
|
|
),
|
|
["to_ignore"],
|
|
True,
|
|
),
|
|
("to_ignore.txt", ["/*.txt"], True),
|
|
(
|
|
os.path.join("rel", "path", "path2", "to_ignore"),
|
|
["rel/*/to_ignore"],
|
|
False,
|
|
),
|
|
(os.path.join("path", "to_ignore.txt"), ["/*.txt"], False),
|
|
(
|
|
os.path.join("rel", "path", "path2", "dont_ignore"),
|
|
["rel/**/to_ignore"],
|
|
False,
|
|
),
|
|
("dont_ignore.txt", ["dont_ignore"], False),
|
|
("dont_ignore.txt", ["dont*", "!dont_ignore.txt"], False),
|
|
("../../../something.txt", ["**/something.txt"], False),
|
|
],
|
|
)
|
|
def test_match_ignore_from_file(
|
|
file_to_ignore_relpath, patterns, expected_match
|
|
):
|
|
|
|
dvcignore_path = os.path.join(
|
|
os.path.sep, "full", "path", "to", "ignore", "file", ".dvcignore"
|
|
)
|
|
dvcignore_dirname = os.path.dirname(dvcignore_path)
|
|
|
|
ignore_file = mock_dvcignore(dvcignore_path, patterns)
|
|
|
|
assert (
|
|
ignore_file.matches(dvcignore_dirname, file_to_ignore_relpath)
|
|
== expected_match
|
|
)
|
|
|
|
|
|
@pytest.mark.parametrize("omit_dir", [".git", ".hg", ".dvc"])
|
|
def test_should_ignore_dir(omit_dir):
|
|
ignore = DvcIgnoreDirs([".git", ".hg", ".dvc"])
|
|
|
|
root = os.path.join(os.path.sep, "walk", "dir", "root")
|
|
dirs = [omit_dir, "dir1", "dir2"]
|
|
files = []
|
|
|
|
new_dirs, _ = ignore(root, dirs, files)
|
|
|
|
assert set(new_dirs) == {"dir1", "dir2"}
|