Stone_Red/dvc
1
0
Fork 0
mirror of https://github.com/Stone-Red-Code/dvc.git synced 2026-11-01 23:08:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

tests: add .gitignore files upon dvc_add (#3455)

Browse Source
This commit is contained in:
Paweł Redzyński
2020-03-13 17:19:35 +02:00
committed by GitHub
parent 682275dc0a
commit 767433d7a4
2 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/dir_helpers.py
+12 -1
View File
@@ -156,7 +156,18 @@ class TmpDir(pathlib.Path):
stages = self.dvc.add(filenames)
if commit:
stage_paths = [s.path for s in stages]
self.scm_add(stage_paths, commit=commit)
def to_gitignore(stage_path):
from dvc.scm import Git
return os.path.join(os.path.dirname(stage_path), Git.GITIGNORE)
gitignores = [
to_gitignore(s)
for s in stage_paths
if os.path.exists(to_gitignore(s))
]
self.scm_add(stage_paths + gitignores, commit=commit)
return stages
tests/func/test_ls.py
+15
View File
@@ -112,8 +112,11 @@ def test_ls_repo_recursive(tmp_dir, dvc, scm):
(("data", "subcontent", "data.xml.dvc"), False),
(("data", "subcontent", "statistics", "data.csv.dvc"), False),
(("data", "subcontent", "statistics", "data.csv"), True),
(("data", "subcontent", "statistics", ".gitignore"), False),
(("data", "subcontent", "data.xml"), True),
(("data", "subcontent", ".gitignore"), False),
(("model", "people.csv"), True),
(("model", ".gitignore"), False),
(("structure.xml",), True),
),
)
@@ -147,6 +150,7 @@ def test_ls_repo_with_target_dir(tmp_dir, dvc, scm):
(("train.py",), False),
(("people.csv",), True),
(("people.csv.dvc",), False),
((".gitignore",), False),
),
)
@@ -172,6 +176,7 @@ def test_ls_repo_with_target_subdir(tmp_dir, dvc, scm):
(("data.xml",), True),
(("data.xml.dvc",), False),
(("statistics",), False),
((".gitignore",), False),
),
)
@@ -249,6 +254,7 @@ def test_ls_repo_with_removed_dvc_dir(tmp_dir, dvc, scm):
(("out.dvc",), False),
(("dep",), True),
(("out",), False),
((".gitignore",), False),
),
)
@@ -265,6 +271,7 @@ def test_ls_repo_with_removed_dvc_dir_recursive(tmp_dir, dvc, scm):
(("out.dvc",), False),
(("dep",), True),
(("out", "file"), True),
((".gitignore",), False),
),
)
@@ -324,8 +331,11 @@ def test_ls_remote_repo_recursive(erepo_dir):
(("data", "subcontent", "data.xml.dvc"), False),
(("data", "subcontent", "statistics", "data.csv.dvc"), False),
(("data", "subcontent", "statistics", "data.csv"), True),
(("data", "subcontent", "statistics", ".gitignore"), False),
(("data", "subcontent", "data.xml"), True),
(("data", "subcontent", ".gitignore"), False),
(("model", "people.csv"), True),
(("model", ".gitignore"), False),
(("structure.xml",), True),
),
)
@@ -363,6 +373,7 @@ def test_ls_remote_repo_with_target_dir(erepo_dir):
(("train.py",), False),
(("people.csv",), True),
(("people.csv.dvc",), False),
((".gitignore",), False),
),
)
@@ -401,9 +412,13 @@ def test_ls_remote_repo_with_rev_recursive(erepo_dir):
(("data", "subcontent", "data.xml.dvc"), False),
(("data", "subcontent", "statistics", "data.csv.dvc"), False),
(("data", "subcontent", "statistics", "data.csv"), True),
(("data", "subcontent", "statistics", ".gitignore"), False),
(("data", "subcontent", "data.xml"), True),
(("data", "subcontent", ".gitignore"), False),
(("model", "people.csv"), True),
(("model", ".gitignore"), False),
(("structure.xml",), True),
((".gitignore",), False),
),
)