valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix pylint

Browse Source
This commit is contained in:
Ch3LL 2018-07-12 12:37:24 -04:00
parent 70e36764ee
commit f69932f506
No known key found for this signature in database
GPG Key ID: 132B55A7C13EFA73
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/client/ssh/wrapper/state.py
View File

@ -31,6 +31,7 @@ __func_alias__ = {
}
log = logging.getLogger(__name__)
def _ssh_state(chunks, __opts__, __context__, __pillar__, __salt__, st_kwargs,
kwargs, test=False):
'''
@ -78,7 +79,7 @@ def _ssh_state(chunks, __opts__, __context__, __pillar__, __salt__, st_kwargs,
try:
return json.loads(stdout, object_hook=salt.utils.decode_dict)
except Exception as e:
log.error("JSON Render failed for: {0}\n{1}".format(stdout, stderr))
log.error("JSON Render failed for: %s\n%s", stdout, stderr)
log.error(str(e))
# If for some reason the json load fails, return the stdout

1
tests/integration/ssh/test_state.py
View File

@ -67,7 +67,6 @@ class SSHStateTest(SSHCase):
self._check_dict_ret(ret=ret, val='__id__',
exp_ret='second_id', equal=False)
check_file = self.run_function('file.file_exists', ['/tmp/test'])
self.assertTrue(check_file)