import: test: refactor to dir helpers #2935
Conversation
|
@pared Tests are failing. |
efiop
added
refactoring
tests/func/test_import.py
Outdated
There was a problem hiding this comment.
We should be there already. If we are not then this is a bug in erepo_dir probably.
There was a problem hiding this comment.
erepo_dir is fixed here #2938, not merged yet.
tests/func/test_import.py
Outdated
There was a problem hiding this comment.
Let's simply use literals and fspath() not str():
dvc.imp(fspath(erepo_dir), "foo", "foo_imported")
tests/func/test_import.py
Outdated
There was a problem hiding this comment.
assert os.path.isfile("foo_imported") should be enough, we don't need both.
tests/func/test_import.py
Outdated
There was a problem hiding this comment.
If we really want to check foo contents then it might be easier/more obvious to check text itself:
assert (tmp_dir / "foo").read_text() == "foo text" I am fine both ways though.
tests/func/test_import.py
Outdated
There was a problem hiding this comment.
assert (tmp_dir / "version").read_text() == "branch"Also why do we need .exists() and .isfile() check?
tests/func/test_import.py
Outdated
There was a problem hiding this comment.
Why do you create new Repo while previously test used .dvc?
tests/func/test_import.py
Outdated
There was a problem hiding this comment.
erepo_dir.scm_add([...], commit="use symlinks")
tests/func/test_import.py
Outdated
There was a problem hiding this comment.
You can use scm directly, you also can use tmp_dir.scm_add(..., commit=...)
|
@pared did you forget about this one? |
|
@Suor |
|
@pared use : with monkeypatch.context() as m:
m.chdir(erepo_dir)
erepo_dir.dvc_gen(...)for now. I will think how to make it easier later. |
|
@pared Tests are failing. |
|
@pared Tests are still failing |
|
For the record: mac pkg test is failing due to unrelated reasons. @pared Need to rebase though 🙂 |
| m.chdir(fspath(erepo_dir)) | ||
| erepo_dir.dvc_gen("foo", "master content", commit="create foo") | ||
| erepo_dir.scm.checkout("new_branch", create_new=True) | ||
| erepo_dir.dvc_gen("foo", "branch content", commit="modify foo") |
There was a problem hiding this comment.
This is a bit complicated bootstrapping. We will need to come up with something better.
3 participants
❗ Have you followed the guidelines in the Contributing to DVC list?
📖 Check this box if this PR does not require documentation updates, or if it does and you have created a separate PR in dvc.org with such updates (or at least opened an issue about it in that repo). Please link below to your PR (or issue) in the dvc.org repo.
❌ Have you checked DeepSource, CodeClimate, and other sanity checks below? We consider their findings recommendatory and don't expect everything to be addressed. Please review them carefully and fix those that actually improve code or fix bugs.
Thank you for the contribution - we'll try to review it as soon as possible. 🙏