Fix test suite hanging on shutdown

This commit is contained in:
Mike Place 2016-10-05 17:14:27 +09:00
parent 30f1a1d7b5
commit bd712bb0ff
No known key found for this signature in database
GPG key ID: 9136F4F13705CFD3

View file

@ -1320,7 +1320,7 @@ class TestDaemon(object):
self.log_server_process.join()
# 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):
'''