Avoid raising exceptions when calling Fileserver.envs #49388
Closed
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
garethgreenaway
approved these changes
Aug 29, 2018
dwoz
changed the title
dwoz
changed the title
gtmanfred
reviewed
Aug 29, 2018
salt/master.py
Outdated
|
|
||
| :param dict load: A payload received from a minion (ignored) | ||
| ''' | ||
| return self._fs_file_envs() |
There was a problem hiding this comment.
Should this be a function call, or an attribute?
There was a problem hiding this comment.
It has historically been a function call but with the wrong arguments. Passing no args returns all environments.
gtmanfred
suggested changes
Aug 29, 2018
gtmanfred
suggested changes
Aug 29, 2018
salt/master.py
Outdated
| @@ -1276,6 +1276,14 @@ def __verify_load(self, load, verify_keys): | |||
|
|
|||
| return load | |||
|
|
|||
| def _file_envs(self, *args): | |||
| ''' | |||
There was a problem hiding this comment.
Ok, so this should accept one keyword load and then add a pylint exception to ignore that load is not used.
|
superseded by #49389 |
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.
What does this PR do?
Fixing the following errors seen in the tests:
salt.fileserver.Fileserver.envssanitizes it's batch keyword arg but that is not designed to handle dictionaries. This method get's called from the following line with a dictionary:https://github.com/saltstack/salt/blob/2018.3.3/salt/master.py#L1788
This
loadargument is not synonymous with either of the keyword args accepted bysalt.fileserver.Fileserver.envs. Adding a proxy method that prevents passing anything tosalt.fileserver.Fileserver.envs.Tests written?
No
Commits signed with GPG?
Yes