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

Merge pull request #36744 from cachedout/fix_test_shutdown

Browse source 
Fix issue where test suite could hang on shutdown
This commit is contained in:
Mike Place 2016-10-04 00:37:00 +09:00 • committed by GitHub
commit 93f1daa4ce
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/integration/__init__.py
View file

@ -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):
'''