Ensure the type of exit codes is None, int or ExitCode #1681
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
Codecov Report
@@ Coverage Diff @@
## develop #1681 +/- ##
===========================================
- Coverage 57.16% 57.15% -0.02%
===========================================
Files 275 275
Lines 33911 33917 +6
===========================================
Hits 19385 19385
- Misses 14526 14532 +6
Continue to review full report at Codecov.
|
muhrin
suggested changes
Jun 22, 2018
aiida/daemon/execmanager.py
Outdated
| elif isinstance(exit_code, ExitCode): | ||
| pass | ||
| else: | ||
| raise ValueError("parse_from_calc returned an 'exit_code' of invalid_type: {}. It should" |
There was a problem hiding this comment.
This string shouldhave a space after shouldotherwise it will print shouldreturn when what it shouldsay is 'should return'...shouldn'tit...
There was a bug in the execute method of the Waiting state of the JobProcess, that in the case of a TransportException, which would occur in the case of a SUBMISSIONFAILED or RETRIEVALFAILED, the returned exit code was a JobCalculationExitStatus enum instance and not the required integer or ExitCode. This would except the process due to the check in the Process.on_finish call. A similar problem existed in the execmanager.parse_results method which also did not guarantee the return of an exit code of a valid type. We now make sure to convert the bool, integer or ExitCode which can be returned by parse_results is converted to an ExitCode before it is returned.
sphuber
force-pushed
the
fix_1679_ensure_type_exit_codes
branch
from
dd5d34f to
f658c4b
Compare
muhrin
approved these changes
Jun 22, 2018
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.
Fixes #1679
There was a bug in the execute method of the Waiting state of the
JobProcess, that in the case of a TransportException, which would
occur in the case of a SUBMISSIONFAILED or RETRIEVALFAILED, the
returned exit code was a JobCalculationExitStatus enum instance
and not the required integer or ExitCode. This would except the
process due to the check in the Process.on_finish call.
A similar problem existed in the execmanager.parse_results method
which also did not guarantee the return of an exit code of a valid
type. We now make sure to convert the bool, integer or ExitCode
which can be returned by parse_results is converted to an ExitCode
before it is returned.