valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #49077 from rallytime/bp-49075

Browse Source 
Back-port #49075 to 2018.3
This commit is contained in:
Nicole Thomas 2018-08-13 15:59:59 -04:00 committed by GitHub
commit 90c2f026b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/support/case.py
View File

@ -533,14 +533,16 @@ class ShellCase(ShellTestCase, AdaptedConfigurationTestCaseMixin, ScriptPathMixi
log.debug('Result of run_ssh for command \'%s\': %s', arg_str, ret)
return ret
def run_run(self, arg_str, with_retcode=False, catch_stderr=False, async=False, timeout=180, config_dir=None):
def run_run(self, arg_str, with_retcode=False, catch_stderr=False,
asynchronous=False, timeout=180, config_dir=None, **kwargs):
'''
Execute salt-run
'''
asynchronous = kwargs.get('async', asynchronous)
arg_str = '-c {0}{async_flag} -t {timeout} {1}'.format(config_dir or self.get_config_dir(),
arg_str,
timeout=timeout,
async_flag=' --async' if async else '')
async_flag=' --async' if asynchronous else '')
ret = self.run_script('salt-run',
arg_str,
with_retcode=with_retcode,