enhance copy_files: single file target, error on empty input list, verbose mode #3483
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
4 tasks
akesandgren
reviewed
Oct 30, 2020
easybuild/tools/filetools.py
Outdated
| elif len(paths) == 1 and target_single_file: | ||
| copy_file(paths[0], target_path) | ||
| if verbose: | ||
| print_msg("%s copied to %s" % (os.path.basename(paths[0]), target_path), prefix=False) |
There was a problem hiding this comment.
Not sure that basename-ing is a good thing to do here. At least I usually want to know the full paths as often as possible...
akesandgren
reviewed
Oct 30, 2020
akesandgren
requested changes
Oct 30, 2020
test/framework/filetools.py
Outdated
| @@ -1551,6 +1551,89 @@ def test_copy_files(self): | |||
| error_pattern = "/toy-0.0.eb exists but is not a directory" | |||
| self.assertErrorRegex(EasyBuildError, error_pattern, ft.copy_files, [bzip2_ec], copied_toy_ec) | |||
|
|
|||
| # by default copy_files allows empty input list, but if allow_empty=False then an error is raised | |||
| ft.copy_files([], self.test_prefix) | |||
| error_pattern = 'One of more files to copy should be specified!' | |||
easybuild/tools/filetools.py
Outdated
| print_msg("%d file(s) copied to %s" % (len(paths), target_path), prefix=False) | ||
|
|
||
| elif not allow_empty: | ||
| raise EasyBuildError("One of more files to copy should be specified!") |
| self.assertEqual(toy_ec_txt, ft.read_file(target)) | ||
|
|
||
| ft.remove_file(target) | ||
|
|
There was a problem hiding this comment.
Add test for target_single_file into path with a missing directory in the path?
| # check behaviour under -x: only printing, no actual copying | ||
| init_config(build_options={'extended_dry_run': True}) | ||
| self.assertFalse(os.path.exists(target)) | ||
| self.assertFalse(os.path.exists(os.path.join(target, 'test.eb'))) |
There was a problem hiding this comment.
Isn't this somewhat redundant, if target doesn't exist (as per the assertFalse above), then target/test.eb can't exist
|
@akesandgren Please re-review, should be OK now. |
|
Going in, thanks @boegel! |
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.
fleshed out from #3482