Remove redundant execution in salt-call#49552
Merged
rallytime merged 3 commits intosaltstack:fluorinefrom Sep 11, 2018
Merged
Conversation
Pull saltstack#48344 added logic to salt-call which runs the desired function using all of the executors, or just the direct_call one if none are configured. However, the previous code which ran the function was not removed, which results in the function being run twice. This removes the (now) redundant function call.
ghost
self-requested a review
gtmanfred
approved these changes
Sep 7, 2018
isbm
approved these changes
Sep 7, 2018
Contributor
Author
|
Before this is merged, I will add an integration test. This seems like something important 😄 |
This was skipped long ago and it really shouldn't need to be anymore. This also rewrites the test to be a bit more robust.
Contributor
Author
|
There was already a test that would have protected us from this regression but it was skipped for a long time now for reasons that are likely no longer valid. So I have removed the skip and rewritten the test to be a bit more robust. |
Contributor
|
@terminalmage Can you fix the lint errors? |
rallytime
approved these changes
Sep 10, 2018
gtmanfred
added a commit
to gtmanfred/salt
that referenced
this pull request
Oct 1, 2018
These numbers were wrong because of the bug fixed in saltstack#49552 Fixes saltstack/salt-jenkins#1135
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
Pull #48344 added logic to salt-call which runs the desired function using all
of the executors, or just the direct_call one if none are configured.
However, the previous code which ran the function was not removed, which
results in the function being run twice.
This removes the (now) redundant function call.