saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix last async issue

Browse source
This commit is contained in:
Daniel Wallace 2018-08-13 10:23:00 -05:00 • committed by rallytime
parent b0d5acbe0d
commit 5e07b8306b
No known key found for this signature in database
GPG key ID: E8F1A4B90D0DEA19
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,