Skip to content

test: a couple of dir helpers fixes #2938

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 12, 2019
Merged

test: a couple of dir helpers fixes #2938

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1643d5
test: fix run_copy fixture when used with scm
Suor Dec 11, 2019
b8cf906
test: stop erepo_dir from undoing parent chdir
Suor Dec 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions tests/dir_helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ def run_copy(tmp_dir, dvc, request):
# Do we need this?
if "scm" in request.fixturenames:
request.getfixturevalue("scm")
tmp_dir.git_add("copy.py", commit="add copy.py")
tmp_dir.scm_add("copy.py", commit="add copy.py")

def run_copy(src, dst, **run_kwargs):
return dvc.run(
Expand All @@ -250,27 +250,27 @@ def erepo_dir(tmp_path_factory, monkeypatch):
path = TmpDir(fspath_py35(tmp_path_factory.mktemp("erepo")))

# Chdir for git and dvc to work locally
monkeypatch.chdir(fspath_py35(path))
with monkeypatch.context() as m:
m.chdir(fspath_py35(path))

_git_init()
path.dvc = Repo.init()
path.scm = path.dvc.scm
path.dvc_gen(REPO_TEMPLATE, commit="init repo")
_git_init()
path.dvc = Repo.init()
path.scm = path.dvc.scm
path.dvc_gen(REPO_TEMPLATE, commit="init repo")

rconfig = RemoteConfig(path.dvc.config)
rconfig.add("upstream", path.dvc.cache.local.cache_dir, default=True)
path.scm_add([path.dvc.config.config_file], commit="add remote")
rconfig = RemoteConfig(path.dvc.config)
rconfig.add("upstream", path.dvc.cache.local.cache_dir, default=True)
path.scm_add([path.dvc.config.config_file], commit="add remote")

path.dvc_gen("version", "master")
path.scm_add([".gitignore", "version.dvc"], commit="master")
path.dvc_gen("version", "master")
path.scm_add([".gitignore", "version.dvc"], commit="master")

path.scm.checkout("branch", create_new=True)
(path / "version").unlink() # For mac ???
path.dvc_gen("version", "branch")
path.scm_add([".gitignore", "version.dvc"], commit="branch")
path.scm.checkout("branch", create_new=True)
(path / "version").unlink() # For mac ???
path.dvc_gen("version", "branch")
path.scm_add([".gitignore", "version.dvc"], commit="branch")

path.scm.checkout("master")
path.dvc.close()
monkeypatch.undo() # Undo chdir
path.scm.checkout("master")
path.dvc.close()

return path