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 outputter tests that come with changes in the default outputter

Browse source
This commit is contained in:
Thomas S Hatch 2013-01-13 00:01:30 -07:00
parent 2f5ee69ee5
commit bdae844eec
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
tests/integration/shell/call.py
View file

@ -33,11 +33,10 @@ class CallTest(integration.ShellCase, integration.ShellCaseCommonTestsMixIn):
def test_default_output(self):
out = self.run_call('-l quiet test.fib 3')
expect = ['local: !!python/tuple',
'- - 0',
' - 1',
' - 1',
' - 2']
expect = ['local:',
' - 0',
' - 1',
' - 1']
self.assertEqual(expect, out[:-1])
def test_text_output(self):
@ -102,7 +101,7 @@ class CallTest(integration.ShellCase, integration.ShellCaseCommonTestsMixIn):
)
)
try:
self.assertIn('local: foo', ret)
self.assertIn('local:', ret)
except AssertionError:
if os.path.isfile(minion_config_file):
os.unlink(minion_config_file)
@ -157,7 +156,7 @@ class CallTest(integration.ShellCase, integration.ShellCaseCommonTestsMixIn):
timeout=15
)
try:
self.assertIn('local: foo', ret)
self.assertIn('local:', ret)
except AssertionError:
if os.path.isfile(minion_config_file):
os.unlink(minion_config_file)
@ -179,7 +178,7 @@ class CallTest(integration.ShellCase, integration.ShellCaseCommonTestsMixIn):
timeout=15
)
try:
self.assertIn('local: foo', ret)
self.assertIn('local:', ret)
finally:
if os.path.isfile(minion_config_file):
os.unlink(minion_config_file)