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

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()