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

Add back changes lost in cherry-pick

Browse source
This commit is contained in:
Erik Johnson 2018-08-13 15:14:18 -05:00
parent a2365317f2
commit 186d333c92
No known key found for this signature in database
GPG key ID: 5E5583C437808F3F
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/integration/shell/test_call.py
View file

@ -413,7 +413,7 @@ class CallTest(ShellCase, testprogram.TestProgramCase, ShellCaseCommonTestsMixin
self.run_script(
'salt-call',
'-c {0} --output-file={1} -l trace -g'.format(
self.get_config_dir(),
self.config_dir,
output_file
),
catch_stderr=True,

2
tests/unit/client/test_ssh.py
View file

@ -48,7 +48,7 @@ class SSHPasswordTests(ShellCase):
opts['selected_target_option'] = 'glob'
opts['tgt'] = 'localhost'
opts['arg'] = []
roster = os.path.join(self.get_config_dir(), 'roster')
roster = os.path.join(self.config_dir, 'roster')
handle_ssh_ret = [
{'localhost': {'retcode': 255, 'stderr': u'Permission denied (publickey).\r\n', 'stdout': ''}},
]