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

Name some more runtests daemon processes

Browse Source
This commit is contained in:
Pedro Algarvio 2015-10-29 16:26:14 +00:00
parent ffa128f275
commit 058cd00aea
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/integration/__init__.py
View File

@ -60,6 +60,7 @@ import salt.log.setup as salt_log_setup
from salt.utils import fopen, get_colors
from salt.utils.verify import verify_env
from salt.utils.immutabletypes import freeze
from salt.utils.process import MultiprocessingProcess
from salt.exceptions import SaltClientError
try:
@ -690,6 +691,7 @@ class TestDaemon(object):
self._exit_mockbin()
self._exit_ssh()
# Shutdown the multiprocessing logging queue listener
salt_log_setup.shutdown_multiprocessing_logging()
salt_log_setup.shutdown_multiprocessing_logging_listener()
def pre_setup_minions(self):
@ -699,7 +701,7 @@ class TestDaemon(object):
def setup_minions(self):
# Wait for minions to connect back
wait_minion_connections = multiprocessing.Process(
wait_minion_connections = MultiprocessingProcess(
target=self.wait_for_minion_connections,
args=(self.minion_targets, self.MINIONS_CONNECT_TIMEOUT)
)
@ -751,7 +753,7 @@ class TestDaemon(object):
# Wait for minions to "sync_all"
for target in [self.sync_minion_modules,
self.sync_minion_states]:
sync_minions = multiprocessing.Process(
sync_minions = MultiprocessingProcess(
target=target,
args=(self.minion_targets, self.MINIONS_SYNC_TIMEOUT)
)
@ -856,6 +858,7 @@ class TestDaemon(object):
]
def wait_for_minion_connections(self, targets, timeout):
salt.utils.appendproctitle('WaitForMinionConnections')
sys.stdout.write(
' {LIGHT_BLUE}*{ENDC} Waiting at most {0} for minions({1}) to '
'connect back\n'.format(
@ -998,9 +1001,11 @@ class TestDaemon(object):
return True
def sync_minion_states(self, targets, timeout=None):
salt.utils.appendproctitle('SyncMinionStates')
self.sync_minion_modules_('states', targets, timeout=timeout)
def sync_minion_modules(self, targets, timeout=None):
salt.utils.appendproctitle('SyncMinionModules')
self.sync_minion_modules_('modules', targets, timeout=timeout)