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

Adapt to expected output

Browse source
This commit is contained in:
Pedro Algarvio 2014-01-20 11:09:56 +00:00
parent a8a8f38ea4
commit b8d45673d5
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
tests/integration/shell/cp.py
View file

@ -133,18 +133,21 @@ class CopyTest(integration.ShellCase, integration.ShellCaseCommonTestsMixIn):
ret = self.run_script(
self._call_binary_,
'--config-dir {0} \'*\' test.ping'.format(
'--config-dir {0} \'*\' foo {0}/foo'.format(
config_dir
),
timeout=15,
catch_stderr=True,
with_retcode=True
)
try:
self.assertIn('local:', ret[0])
self.assertIn('minion', '\n'.join(ret[0]))
self.assertIn('sub_minion', '\n'.join(ret[0]))
self.assertFalse(os.path.isdir(os.path.join(config_dir, 'file:')))
except AssertionError:
# We now fail when we're unable to properly set the syslog logger
if os.path.exists('/dev/log') and ret[2] != 2:
# If there's a syslog device and the exit code was not 2, 'No
# such file or directory', raise the error
raise
self.assertIn(
'Failed to setup the Syslog logging handler', '\n'.join(ret[1])
)