mirror of
https://github.com/valitydev/salt.git
synced 2024-11-06 16:45:27 +00:00
Fix issue where test suite could hang on shutdown
This is most common in the develop branch but could occur here as well.
This commit is contained in:
parent
c089ac6c67
commit
cdf2a56564
@ -704,7 +704,7 @@ class TestDaemon(object):
|
||||
self._exit_ssh()
|
||||
# Shutdown the multiprocessing logging queue listener
|
||||
salt_log_setup.shutdown_multiprocessing_logging()
|
||||
salt_log_setup.shutdown_multiprocessing_logging_listener()
|
||||
salt_log_setup.shutdown_multiprocessing_logging_listener(daemonizing=True)
|
||||
|
||||
def pre_setup_minions(self):
|
||||
'''
|
||||
|
Loading…
Reference in New Issue
Block a user