add: test: convert to dir helpers 1 #2898
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Suor
suggested changes
Dec 5, 2019
tests/func/test_add.py
Outdated
| @@ -168,17 +168,19 @@ def test(self): | |||
| self.assertTrue(stages[0] is not None) | |||
|
|
|||
|
|
|||
| def test_add_file_in_dir(repo_dir, dvc_repo): | |||
| stage, = dvc_repo.add(repo_dir.DATA_SUB) | |||
| def test_add_file_in_dir(dvc, tmp_dir): | |||
There was a problem hiding this comment.
The order doesn't matter to python, but it matters to reader. Let's list fixtures in the same order everywhere: tmp_dir, scm (if used), dvc. This is chronological: temp dir is created, then git init, then dvc init.
| new_file = os.path.join(repo_dir.DATA_DIR, "new_file") | ||
| def test_readding_dir_should_not_unprotect_all(dvc, tmp_dir, mocker): | ||
| tmp_dir.gen({"dir": {"data": "data"}}) | ||
| dvc.cache.local.cache_types = ["symlink"] |
There was a problem hiding this comment.
I would add an empty line after tmp_dir.gen(), up to you.
tests/func/test_add.py
Outdated
|
|
||
| repo_dir.create(new_file, "new_content") | ||
| dvc.add("dir") | ||
| tmp_dir.gen({"dir": {"new_file": "new_file_content"}}) |
There was a problem hiding this comment.
Other option:
tmp_dir.get("dir/new_file", "new_file_contents")Less punctuation.
tests/func/test_add.py
Outdated
| shutil.copy(repo_dir.BAR, repo_dir.FOO) | ||
| tmp_dir.gen({"foo": "foo", "bar": "bar"}) | ||
| dvc.add("foo") | ||
| dvc.add("bar") |
There was a problem hiding this comment.
Replace 3 lines with:
Suggested change
| dvc.add("bar") | |
| tmp_dir.dvc_gen({"foo": "foo", "bar": "bar"}) |
test_add_file_in_dir test_readding_dir_should_not_unprotect_all test_should_not_checkout_when_adding_cached_copy
Suor
approved these changes
Dec 6, 2019
efiop
approved these changes
Dec 6, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
test_add_file_in_dir
test_readding_dir_should_not_unprotect_all
test_should_not_checkout_when_adding_cached_copy
❗ 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. 🙏
related to #2896
Started doing whole
test_add, but iterations will probably be faster in batches, also reviewing 3 changed tests is easier than 20.