Fix salt.utils.decorators.Depends #31888
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
bebdc26 broke this decorator, because switching from getting the module to getting a frame means dir(frame) does not contain the imported names. Those now reside in frame.f_globals and frame.f_locals. This commit fixes the membership check to look in the proper location.
|
My new test has passed: http://166.78.178.63:8080/job/PR/job/salt-pr-rs-cent7-n/319/testReport/integration.loader.loader/LazyLoaderTest/test_depends/ However, the lint check doesn't look like it ran. |
|
Go Go Jenkins! |
1 similar comment
|
Go Go Jenkins! |
rallytime
pushed a commit
that referenced
this pull request
Mar 15, 2016
Fix salt.utils.decorators.Depends
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.
bebdc26 broke this decorator, because switching from getting the module to
getting a frame means
dir(frame)does not contain the imported names. Thosenow reside in
frame.f_globalsandframe.f_locals.This pull request fixes the membership check to look in the proper location,
and adds an integration test to confirm correct behavior of the depends
decorator.