mirror of
https://github.com/Stone-Red-Code/dvc.git
synced 2026-11-02 07:18:25 +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
134 lines
4.0 KiB
Python
134 lines
4.0 KiB
Python
import os
|
|
import shutil
|
|
|
|
import pytest
|
|
|
|
from dvc.exceptions import DvcIgnoreInCollectedDirError
|
|
from dvc.ignore import DvcIgnore
|
|
from dvc.utils.compat import cast_bytes
|
|
from dvc.utils.fs import get_mtime_and_size
|
|
from tests.basic_env import TestDvc
|
|
from tests.utils import to_posixpath
|
|
|
|
|
|
class TestDvcIgnore(TestDvc):
|
|
def setUp(self):
|
|
super(TestDvcIgnore, self).setUp()
|
|
|
|
def _get_all_paths(self):
|
|
|
|
paths = []
|
|
for root, dirs, files in self.dvc.tree.walk(
|
|
self.dvc.root_dir, dvcignore=self.dvc.dvcignore
|
|
):
|
|
for dname in dirs:
|
|
paths.append(os.path.join(root, dname))
|
|
|
|
for fname in files:
|
|
paths.append(os.path.join(root, fname))
|
|
|
|
return paths
|
|
|
|
def test_ignore_in_child_dir(self):
|
|
ignore_file = os.path.join(self.dvc.root_dir, DvcIgnore.DVCIGNORE_FILE)
|
|
with open(ignore_file, "w") as fobj:
|
|
fobj.write("data_dir/data")
|
|
|
|
forbidden_path = os.path.join(self.dvc.root_dir, self.DATA)
|
|
all_paths = self._get_all_paths()
|
|
|
|
self.assertNotIn(forbidden_path, all_paths)
|
|
|
|
def test_ignore_in_child_dir_unicode(self):
|
|
ignore_file = os.path.join(self.dvc.root_dir, DvcIgnore.DVCIGNORE_FILE)
|
|
with open(ignore_file, "wb") as fobj:
|
|
fobj.write(cast_bytes(self.UNICODE, "utf-8"))
|
|
|
|
forbidden_path = os.path.join(self.dvc.root_dir, self.UNICODE)
|
|
all_paths = self._get_all_paths()
|
|
|
|
self.assertNotIn(forbidden_path, all_paths)
|
|
|
|
def test_ignore_in_parent_dir(self):
|
|
ignore_file = os.path.join(self.dvc.root_dir, DvcIgnore.DVCIGNORE_FILE)
|
|
with open(ignore_file, "w") as fobj:
|
|
fobj.write("data_dir/data")
|
|
|
|
os.chdir(self.DATA_DIR)
|
|
|
|
forbidden_path = os.path.join(self.dvc.root_dir, self.DATA)
|
|
all_paths = self._get_all_paths()
|
|
|
|
self.assertNotIn(forbidden_path, all_paths)
|
|
|
|
|
|
def test_metadata_unchanged_when_moving_ignored_file(dvc_repo, repo_dir):
|
|
new_data_path = repo_dir.DATA_SUB + "_new"
|
|
|
|
ignore_file = os.path.join(dvc_repo.root_dir, DvcIgnore.DVCIGNORE_FILE)
|
|
repo_dir.create(
|
|
ignore_file,
|
|
"\n".join(
|
|
[to_posixpath(repo_dir.DATA_SUB), to_posixpath(new_data_path)]
|
|
),
|
|
)
|
|
|
|
mtime_sig, size = get_mtime_and_size(repo_dir.DATA_DIR, dvc_repo.dvcignore)
|
|
|
|
shutil.move(repo_dir.DATA_SUB, new_data_path)
|
|
|
|
new_mtime_sig, new_size = get_mtime_and_size(
|
|
repo_dir.DATA_DIR, dvc_repo.dvcignore
|
|
)
|
|
|
|
assert new_mtime_sig == mtime_sig
|
|
assert new_size == size
|
|
|
|
|
|
def test_mtime_changed_when_moving_non_ignored_file(dvc_repo, repo_dir):
|
|
new_data_path = repo_dir.DATA_SUB + "_new"
|
|
mtime, size = get_mtime_and_size(repo_dir.DATA_DIR, dvc_repo.dvcignore)
|
|
|
|
shutil.move(repo_dir.DATA_SUB, new_data_path)
|
|
new_mtime, new_size = get_mtime_and_size(
|
|
repo_dir.DATA_DIR, dvc_repo.dvcignore
|
|
)
|
|
|
|
assert new_mtime != mtime
|
|
assert new_size == size
|
|
|
|
|
|
def test_metadata_unchanged_on_ignored_file_deletion(dvc_repo, repo_dir):
|
|
ignore_file = os.path.join(dvc_repo.root_dir, DvcIgnore.DVCIGNORE_FILE)
|
|
repo_dir.create(ignore_file, to_posixpath(repo_dir.DATA_SUB))
|
|
|
|
mtime, size = get_mtime_and_size(repo_dir.DATA_DIR, dvc_repo.dvcignore)
|
|
|
|
os.remove(repo_dir.DATA_SUB)
|
|
new_mtime, new_size = get_mtime_and_size(
|
|
repo_dir.DATA_DIR, dvc_repo.dvcignore
|
|
)
|
|
|
|
assert new_mtime == mtime
|
|
assert new_size == size
|
|
|
|
|
|
def test_metadata_changed_on_non_ignored_file_deletion(dvc_repo, repo_dir):
|
|
mtime, size = get_mtime_and_size(repo_dir.DATA_DIR, dvc_repo.dvcignore)
|
|
|
|
os.remove(repo_dir.DATA_SUB)
|
|
new_mtime_sig, new_size = get_mtime_and_size(
|
|
repo_dir.DATA_DIR, dvc_repo.dvcignore
|
|
)
|
|
|
|
assert new_mtime_sig != mtime
|
|
assert new_size != size
|
|
|
|
|
|
def test_should_raise_on_dvcignore_in_out_dir(dvc_repo, repo_dir):
|
|
ignore_file = os.path.join(repo_dir.DATA_DIR, DvcIgnore.DVCIGNORE_FILE)
|
|
repo_dir.create(ignore_file, "")
|
|
|
|
with pytest.raises(DvcIgnoreInCollectedDirError):
|
|
dvc_repo.add(repo_dir.DATA_DIR)
|