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

Refactor the start_daemon function

Browse source
This commit is contained in:
Thomas Jackson 2015-01-13 08:28:41 -08:00
parent 403c81c2a6
commit e376b283ef
1 changed files with 33 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
tests/integration/__init__.py
View file

@ -230,67 +230,55 @@ class TestDaemon(object):
finally:
self.post_setup_minions()
def start_daemon(self, cls, opts, start_fun):
def start(cls, opts, start_fun):
daemon = cls(opts)
getattr(daemon, start_fun)()
process = multiprocessing.Process(target=start,
args=(cls, opts, start_fun))
process.start()
return process
def start_zeromq_daemons(self):
'''
Fire up the daemons used for zeromq tests
'''
def start_daemon(cls, opts, start_fun):
daemon = cls(opts)
getattr(daemon, start_fun)()
self.master_process = self.start_daemon(salt.master.Master,
self.master_opts,
'start')
self.master_process = multiprocessing.Process(target=start_daemon,
args=(salt.master.Master,
self.master_opts,
'start',)
)
self.master_process.start()
self.minion_process = self.start_daemon(salt.minion.Minion,
self.minion_opts,
'tune_in')
self.minion_process = multiprocessing.Process(target=start_daemon,
args=(salt.minion.Minion,
self.minion_opts,
'tune_in',)
)
self.minion_process.start()
self.sub_minion_process = self.start_daemon(salt.minion.Minion,
self.sub_minion_opts,
'tune_in')
self.sub_minion_process = multiprocessing.Process(target=start_daemon,
args=(salt.minion.Minion,
self.sub_minion_opts,
'tune_in',)
)
self.sub_minion_process.start()
self.smaster_process = self.start_daemon(salt.master.Master,
self.syndic_master_opts,
'start')
self.smaster_process = multiprocessing.Process(target=start_daemon,
args=(salt.master.Master,
self.syndic_master_opts,
'start',)
)
self.smaster_process.start()
self.syndic_process = multiprocessing.Process(target=start_daemon,
args=(salt.minion.Syndic,
self.syndic_opts,
'tune_in',)
)
self.syndic_process.start()
self.syndic_process = self.start_daemon(salt.minion.Syndic,
self.syndic_opts,
'tune_in')
def start_raet_daemons(self):
'''
Fire up the raet daemons!
'''
import salt.daemons.flo
master = salt.daemons.flo.IofloMaster(self.master_opts)
self.master_process = multiprocessing.Process(target=master.start)
self.master_process.start()
self.master_process = self.start_daemon(salt.daemons.flo.IofloMaster,
self.master_opts,
'start')
minion = salt.daemons.flo.IofloMinion(self.minion_opts)
self.minion_process = multiprocessing.Process(target=minion.tune_in)
self.minion_process.start()
self.minion_process = self.start_daemon(salt.daemons.flo.IofloMinion,
self.minion_opts,
'tune_in')
sub_minion = salt.daemons.flo.IofloMinion(self.sub_minion_opts)
self.sub_minion_process = multiprocessing.Process(
target=sub_minion.tune_in
)
self.sub_minion_process.start()
self.sub_minion_process = self.start_daemon(salt.daemons.flo.IofloMinion,
self.sub_minion_opts,
'tune_in')
# Wait for the daemons to all spin up
time.sleep(5)