mirror of
https://github.com/Stone-Red-Code/dvc.git
synced 2026-11-10 07:18:27 +01:00
Saugat Pachhai (सौगात)
32cd6c2c03
This commit: * defines a `Ignore` protocol in `dvc.objects`, that expects a `find` method. This will be used in dvc-data and dvc-objects instead of depending on dvc.ignore. dvcignore is expected to respect this protocol, which it does. * renames `dvcignore` kwarg to `ignore` in `dvc-data` and `dvc-objects`. * teaches dvc.cli that `IgnoreInCollectedError` is a known exception and is logged correctly and adds a test for the behaviour. I am not happy that we need to hardcode `.dvcignore` in dvc-data but I don't see any easy way, since we always try to avoid staging if the tree contains .dvcignore file, even if .dvcignore is not passed.
87 lines
2.4 KiB
Python
87 lines
2.4 KiB
Python
from argparse import Namespace
|
|
|
|
import pytest
|
|
from funcy import raiser
|
|
|
|
from dvc.cli import main
|
|
from dvc.data.stage import IgnoreInCollectedDirError
|
|
from dvc.objects.cache import DiskError
|
|
from dvc.objects.fs.base import FileSystem, RemoteMissingDepsError
|
|
|
|
|
|
def test_state_pickle_errors_are_correctly_raised(tmp_dir, caplog, mocker):
|
|
path = tmp_dir / "dir" / "test"
|
|
mocker.patch(
|
|
"dvc.cli.parse_args",
|
|
return_value=Namespace(
|
|
func=raiser(DiskError(path, "md5s")),
|
|
quiet=False,
|
|
verbose=True,
|
|
),
|
|
)
|
|
|
|
assert main() == 255
|
|
assert (
|
|
f"Could not open pickled 'md5s' cache.\n"
|
|
f"Remove the '{path.relative_to(tmp_dir)}' directory "
|
|
"and then retry this command.\n"
|
|
"See <https://error.dvc.org/pickle> for more information."
|
|
) in caplog.text
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"pkg, msg",
|
|
[
|
|
(None, "Please report this bug to"),
|
|
("pip", "pip install 'dvc[proto]'"),
|
|
("conda", "conda install -c conda-forge dvc-proto"),
|
|
],
|
|
)
|
|
def test_remote_missing_deps_are_correctly_reported(
|
|
tmp_dir, caplog, mocker, pkg, msg
|
|
):
|
|
error = RemoteMissingDepsError(FileSystem(), "proto", "proto://", ["deps"])
|
|
mocker.patch("dvc.utils.pkg.PKG", pkg)
|
|
mocker.patch(
|
|
"dvc.cli.parse_args",
|
|
return_value=Namespace(
|
|
func=raiser(error),
|
|
quiet=False,
|
|
verbose=True,
|
|
),
|
|
)
|
|
|
|
assert main() == 255
|
|
expected = (
|
|
"URL 'proto://' is supported but requires these missing dependencies: "
|
|
"['deps']. "
|
|
)
|
|
if pkg:
|
|
expected += (
|
|
"To install dvc with those dependencies, run:\n\n"
|
|
f"\t{msg}\n\n"
|
|
"See <https://dvc.org/doc/install> for more info."
|
|
)
|
|
else:
|
|
expected += (
|
|
"\nPlease report this bug to "
|
|
"<https://github.com/iterative/dvc/issues>. "
|
|
"Thank you!"
|
|
)
|
|
assert expected in caplog.text
|
|
|
|
|
|
def test_ignore_in_collected_dir_error_is_logged(tmp_dir, caplog, mocker):
|
|
error = IgnoreInCollectedDirError(".dvcignore", "dir")
|
|
mocker.patch(
|
|
"dvc.cli.parse_args",
|
|
return_value=Namespace(
|
|
func=raiser(error),
|
|
quiet=False,
|
|
verbose=True,
|
|
),
|
|
)
|
|
assert main() == 255
|
|
expected = ".dvcignore file should not be in collected dir path: 'dir'"
|
|
assert expected in caplog.text
|