Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[2015.8] Merge forward from 2015.5 to 2015.8 #34451

Merged
merged 3 commits into from
Jul 5, 2016
Merged

[2015.8] Merge forward from 2015.5 to 2015.8 #34451

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0e2c71a
Backport change to integraiton test suite
Jul 1, 2016
8c72ee5
Merge pull request #34435 from cachedout/backport_config_dir_integration
Jul 5, 2016
55a91e2
Merge branch '2015.5' into '2015.8'
Jul 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tests/integration/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 '')
Expand Down