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

fixs integration terminate error

Browse source
This commit is contained in:
cmcmarrow 2019-07-29 09:20:46 -06:00
parent 69c3106837
commit 05cd93fcfd
No known key found for this signature in database
GPG key ID: 62FAA6B3AC79AD2F
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
tests/integration/__init__.py
View file

@ -1081,19 +1081,22 @@ class TestDaemon(object):
Kill the minion and master processes
'''
if hasattr(self.sub_minion_process, 'terminate'):
log.error('self.sub_minion_process can\'t be terminate.')
self.sub_minion_process.terminate()
else:
log.error('self.sub_minion_process can\'t be terminate.')
if hasattr(self.minion_process, 'terminate'):
log.error('self.minion_process can\'t be terminate.')
self.minion_process.terminate()
else:
log.error('self.minion_process can\'t be terminate.')
if hasattr(self, 'proxy_process'):
self.proxy_process.terminate()
if hasattr(self.master_process, 'terminate'):
log.error('self.master_process can\'t be terminate.')
self.master_process.terminate()
else:
log.error('self.master_process can\'t be terminate.')
try:
self.syndic_process.terminate()