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

Fix unit test expected results since we now exit with an error code.

Browse source
This commit is contained in:
Pedro Algarvio 2014-01-19 07:47:15 +00:00
parent 05b2636cd5
commit c6de2adb31
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tests/integration/shell/matcher.py
View file

@ -241,11 +241,19 @@ class MatchTest(integration.ShellCase, integration.ShellCaseCommonTestsMixIn):
'--config-dir {0} minion test.ping'.format(
config_dir
),
timeout=15
timeout=15,
catch_stderr=True,
with_retcode=True
)
try:
self.assertIn('minion', '\n'.join(ret))
self.assertIn('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
self.assertIn(
'Failed to setup the Syslog logging handler', '\n'.join(ret[1])
)
self.assertEqual(ret[2], 2)
finally:
os.chdir(old_cwd)
if os.path.isdir(config_dir):