Merge pull request #34451 from rallytime/merge-2015.8

[2015.8] Merge forward from 2015.5 to 2015.8
saltstack · Jul 5, 2016 · 7bb0868 · 7bb0868
2 parents e65d1ae + 55a91e2
commit 7bb0868
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/tests/integration/__init__.py b/tests/integration/__init__.py
@@ -1226,11 +1226,11 @@ def run_ssh(self, arg_str, with_retcode=False, catch_stderr=False):
         arg_str = '-c {0} -i --priv {1} --roster-file {2} --out=json localhost {3}'.format(self.get_config_dir(), os.path.join(TMP_CONF_DIR, 'key_test'), os.path.join(TMP_CONF_DIR, 'roster'), arg_str)
         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):
+    def run_run(self, arg_str, with_retcode=False, catch_stderr=False, async=False, timeout=60, config_dir=None):
         '''
         Execute salt-run
         '''
-        arg_str = '-c {0}{async_flag} -t {timeout} {1}'.format(self.get_config_dir(),
+        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 '')