Fix new graph parser bug (PR to 6.11.1) #2002
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
Ensure that it overrides a `True` setting in `global.rc`.
Use common test infrastructure to set up temporary suite location, etc.
For conditional expressions containing same task name with and without an offset, e.g. "foo | foo[-P1D] => bar".
|
@matthewrmshin - please review and/or assign |
hjoliver
commented
Sep 17, 2016
| @@ -317,10 +317,13 @@ def _proc_dep_pair(self, left, right): | |||
| n_info = [] | |||
| expr = left | |||
| for name, offset, trig in info: | |||
| offset = offset or '' | |||
There was a problem hiding this comment.
No offset already results in an empty string here, not None.
matthewrmshin
approved these changes
Sep 19, 2016
|
@arjclark please do a quick sanity check. |
|
@hjoliver - could you note what those two commits are that you're bundling in with this in the opening post for ease of tracking what's gone into 6.11.x at a later date. |
|
Looks OK to me. No problems from the test-battery in my environment. |
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.
First PR targeting the new 6.11.x branch.
Conditional expression processing is failing if the same task name appears in an expression with and without a cycle point offset, e.g.:
(NIWA has an operational suite with this sort of construct in it).
This shows the problem is that the explicit
:succeedtrigger is getting substituted in before the offsetfoo:succeed[-P1D]instead of after itfoo[-P1D]:succeed. (only if the same name occurs with and without an offset in the same expression).This PR branch includes two commits merged to master since 6.11.0 as well: #1999 and #2000. Both affect only the test battery.
I'll make a copy of the branch for a PR to master as well.