valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Skip cleaning up syndic stuff so we don't have issues with raet tests

Browse Source 
before the syndic stuff is all ready for testing
This commit is contained in:
Thomas S Hatch 2014-06-12 12:33:56 -06:00
parent 94bee6758a
commit af1a21691a
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/integration/__init__.py
View File

@ -548,10 +548,16 @@ class TestDaemon(object):
self.minion_process.join()
salt.master.clean_proc(self.master_process, wait_for_kill=50)
self.master_process.join()
salt.master.clean_proc(self.syndic_process, wait_for_kill=50)
self.syndic_process.join()
salt.master.clean_proc(self.smaster_process, wait_for_kill=50)
self.smaster_process.join()
try:
salt.master.clean_proc(self.syndic_process, wait_for_kill=50)
self.syndic_process.join()
except AttributeError:
pass
try:
salt.master.clean_proc(self.smaster_process, wait_for_kill=50)
self.smaster_process.join()
except AttributeError:
pass
self._exit_mockbin()
self._exit_ssh()
self._clean()