mirror of
https://github.com/Stone-Red-Code/dvc.git
synced 2026-11-16 23:09:55 +01:00
* Two new mode `-all` and `--stdin` for check-ignore Fix #4321 Introduce new arguments --all for dvc check-ignore Add tests for dvc check-ignore --all * `--stdin` and targets only one 1. `--stdin` and targets can and only can have one 2. more tests * New tests for stdin mode and solve a problem 1. Add a new tests with mock stdin for interactive mode 2. Solve the problem of `assert "" in caplog.text` in tests always `True`. * Remove path_input interface 1. remove path_input and make _ask to a public method instead * Update dvc/command/check_ignore.py * Update dvc/command/check_ignore.py * Update dvc/command/check_ignore.py * Update dvc/command/check_ignore.py * Update dvc/command/check_ignore.py * Update dvc/command/check_ignore.py * Update dvc/command/check_ignore.py * Update dvc/command/check_ignore.py * fix styling Co-authored-by: karajan1001 <[email protected]> Co-authored-by: Ruslan Kuprieiev <[email protected]> Co-authored-by: Ruslan Kuprieiev <[email protected]>
136 lines
3.9 KiB
Python
136 lines
3.9 KiB
Python
import os
|
|
|
|
import pytest
|
|
|
|
from dvc.ignore import DvcIgnore
|
|
from dvc.main import main
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"file,ret,output", [("ignored", 0, True), ("not_ignored", 1, False)]
|
|
)
|
|
def test_check_ignore(tmp_dir, dvc, file, ret, output, caplog):
|
|
tmp_dir.gen(DvcIgnore.DVCIGNORE_FILE, "ignored")
|
|
|
|
assert main(["check-ignore", file]) == ret
|
|
assert (file in caplog.text) is output
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"file,ret,output",
|
|
[
|
|
("file", 0, "{}:1:f*\tfile\n".format(DvcIgnore.DVCIGNORE_FILE)),
|
|
("foo", 0, "{}:2:!foo\tfoo\n".format(DvcIgnore.DVCIGNORE_FILE)),
|
|
(
|
|
os.path.join("dir", "foobar"),
|
|
0,
|
|
"{}:1:foobar\t{}\n".format(
|
|
os.path.join("dir", DvcIgnore.DVCIGNORE_FILE),
|
|
os.path.join("dir", "foobar"),
|
|
),
|
|
),
|
|
],
|
|
)
|
|
def test_check_ignore_details(tmp_dir, dvc, file, ret, output, caplog):
|
|
tmp_dir.gen(DvcIgnore.DVCIGNORE_FILE, "f*\n!foo")
|
|
tmp_dir.gen({"dir": {DvcIgnore.DVCIGNORE_FILE: "foobar"}})
|
|
|
|
assert main(["check-ignore", "-d", file]) == ret
|
|
assert output in caplog.text
|
|
|
|
|
|
@pytest.mark.parametrize("non_matching", [True, False])
|
|
def test_check_ignore_non_matching(tmp_dir, dvc, non_matching, caplog):
|
|
tmp_dir.gen(DvcIgnore.DVCIGNORE_FILE, "other")
|
|
if non_matching:
|
|
assert main(["check-ignore", "-d", "-n", "file"]) == 1
|
|
else:
|
|
assert main(["check-ignore", "-d", "file"]) == 1
|
|
|
|
assert ("::\tfile\n" in caplog.text) is non_matching
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"args",
|
|
[
|
|
["-n", "file"],
|
|
["-a", "file"],
|
|
["-q", "-d", "file"],
|
|
["--stdin", "file"],
|
|
[],
|
|
],
|
|
)
|
|
def test_check_ignore_error_args_cases(tmp_dir, dvc, args):
|
|
assert main(["check-ignore"] + args) == 255
|
|
|
|
|
|
@pytest.mark.parametrize("path,ret", [({"dir": {}}, 0), ({"dir": "files"}, 1)])
|
|
def test_check_ignore_dir(tmp_dir, dvc, path, ret):
|
|
tmp_dir.gen(DvcIgnore.DVCIGNORE_FILE, "dir/")
|
|
tmp_dir.gen(path)
|
|
|
|
assert main(["check-ignore", "-q", "dir"]) == ret
|
|
|
|
|
|
def test_check_ignore_default_dir(tmp_dir, dvc):
|
|
assert main(["check-ignore", "-q", ".dvc"]) == 1
|
|
|
|
|
|
def test_check_ignore_out_side_repo(tmp_dir, dvc):
|
|
tmp_dir.gen(DvcIgnore.DVCIGNORE_FILE, "file")
|
|
assert main(["check-ignore", "-q", "../file"]) == 1
|
|
|
|
|
|
def test_check_ignore_sub_repo(tmp_dir, dvc):
|
|
tmp_dir.gen(
|
|
{DvcIgnore.DVCIGNORE_FILE: "other", "dir": {".dvc": {}, "foo": "bar"}}
|
|
)
|
|
|
|
assert main(["check-ignore", "-q", os.path.join("dir", "foo")]) == 1
|
|
|
|
|
|
def test_check_sub_dir_ignore_file(tmp_dir, dvc, caplog):
|
|
tmp_dir.gen(
|
|
{
|
|
DvcIgnore.DVCIGNORE_FILE: "other",
|
|
"dir": {DvcIgnore.DVCIGNORE_FILE: "bar\nfoo", "foo": "bar"},
|
|
}
|
|
)
|
|
|
|
assert main(["check-ignore", "-d", os.path.join("dir", "foo")]) == 0
|
|
assert (
|
|
"{}:2:foo\t{}".format(
|
|
os.path.join("dir", DvcIgnore.DVCIGNORE_FILE),
|
|
os.path.join("dir", "foo"),
|
|
)
|
|
in caplog.text
|
|
)
|
|
|
|
sub_dir = tmp_dir / "dir"
|
|
with sub_dir.chdir():
|
|
assert main(["check-ignore", "-d", "foo"]) == 0
|
|
assert ".dvcignore:2:foo\tfoo" in caplog.text
|
|
|
|
|
|
def test_check_ignore_details_all(tmp_dir, dvc, caplog):
|
|
tmp_dir.gen(DvcIgnore.DVCIGNORE_FILE, "f*\n!foo")
|
|
|
|
assert main(["check-ignore", "-d", "-a", "foo"]) == 0
|
|
assert "{}:1:f*\tfoo\n".format(DvcIgnore.DVCIGNORE_FILE) in caplog.text
|
|
assert "{}:2:!foo\tfoo\n".format(DvcIgnore.DVCIGNORE_FILE) in caplog.text
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"file,ret,output", [("ignored", 0, True), ("not_ignored", 1, False)]
|
|
)
|
|
def test_check_ignore_stdin_mode(
|
|
tmp_dir, dvc, file, ret, output, caplog, mocker
|
|
):
|
|
tmp_dir.gen(DvcIgnore.DVCIGNORE_FILE, "ignored")
|
|
mocker.patch("builtins.input", side_effect=[file, ""])
|
|
stdout_mock = mocker.patch("sys.stdout")
|
|
stdout_mock.isatty.return_value = True
|
|
|
|
assert main(["check-ignore", "--stdin"]) == ret
|
|
assert (file in caplog.text) is output
|