From 5e07b8306bad7f116dbadd03eed277e4416537d0 Mon Sep 17 00:00:00 2001 From: Daniel Wallace Date: Mon, 13 Aug 2018 10:23:00 -0500 Subject: [PATCH] fix last async issue --- tests/support/case.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/support/case.py b/tests/support/case.py index 57ce7e8739..9b388c53b6 100644 --- a/tests/support/case.py +++ b/tests/support/case.py @@ -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,