mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-02-13 02:47:39 -08:00
b1cc437e84
Copyright: Sony Interactive Entertainment Inc. Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Patrick McLean <chutzpah@gentoo.org>
22 lines
1.2 KiB
Diff
22 lines
1.2 KiB
Diff
diff --git a/salttesting/case.py b/salttesting/case.py
|
|
index 4918915..19e47cc 100644
|
|
--- a/salttesting/case.py
|
|
+++ b/salttesting/case.py
|
|
@@ -140,14 +140,14 @@ class ShellTestCase(TestCase, AdaptedConfigurationTestCaseMixIn):
|
|
)
|
|
return self.run_script('salt-ssh', arg_str, with_retcode=with_retcode, catch_stderr=catch_stderr, raw=True)
|
|
|
|
- def run_run(self, arg_str, with_retcode=False, catch_stderr=False, async=False, timeout=60, config_dir=None):
|
|
+ def run_run(self, arg_str, with_retcode=False, catch_stderr=False, async_flag=False, timeout=60, config_dir=None):
|
|
'''
|
|
Execute salt-run
|
|
'''
|
|
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 async_flag else '')
|
|
return self.run_script('salt-run', arg_str, with_retcode=with_retcode, catch_stderr=catch_stderr)
|
|
|
|
def run_run_plus(self, fun, *arg, **kwargs):
|