valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Check separately, the order can change.

Browse Source
This commit is contained in:
Pedro Algarvio 2013-09-05 07:54:03 +01:00
parent 39d1c8c02b
commit a55bc65f66
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/integration/modules/supervisord.py
View File

@ -80,9 +80,8 @@ class SupervisordModuleTest(integration.ModuleCase):
ret = self.run_function(
'supervisord.start', [], conf_file=self.supervisor_conf,
bin_env=self.venv_dir)
self.assertEqual(
ret, 'sleep_service: started\nsleep_service2: started'
)
self.assertIn('sleep_service: started', ret)
self.assertIn('sleep_service2: started', ret)
def test_start_all_already_running(self):
'''
@ -158,8 +157,8 @@ class SupervisordModuleTest(integration.ModuleCase):
ret = self.run_function(
'supervisord.restart', ['sleep_service'],
conf_file=self.supervisor_conf, bin_env=self.venv_dir)
self.assertEqual(
ret, 'sleep_service: ERROR (not running)\nsleep_service: started')
self.assertIn('sleep_service: ERROR (not running)', ret)
self.assertIn('sleep_service: started', ret)
def test_stop_all(self):
'''