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

Attempt to fix integration.shell.test_call test

Browse source
This commit is contained in:
Daniel A. Wozniak 2019-08-19 22:42:37 +00:00
parent 659c805218
commit ed7103ae6c
No known key found for this signature in database
GPG key ID: 166B9D2C06C82D61
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
salt/utils/schedule.py
View file

@ -44,7 +44,7 @@ import salt.minion
import salt.payload
import salt.syspaths
import salt.exceptions
import salt.log.setup as log_setup
#import salt.log.setup as log_setup
import salt.defaults.exitcodes
from salt.utils.odict import OrderedDict
@ -660,9 +660,9 @@ class Schedule(object):
ret['jid']
)
if multiprocessing_enabled and not salt.utils.platform.is_windows():
# Reconfigure multiprocessing logging after daemonizing
log_setup.setup_multiprocessing_logging()
# if multiprocessing_enabled and not salt.utils.platform.is_windows():
# # Reconfigure multiprocessing logging after daemonizing
# log_setup.setup_multiprocessing_logging()
# TODO: Make it readable! Splt to funcs, remove nested try-except-finally sections.
try:
@ -1728,6 +1728,7 @@ class Schedule(object):
def cleanup_subprocesses(self):
self._subprocess_list.cleanup()
def clean_proc_dir(opts):
'''

2
tests/unit/utils/test_process.py
View file

@ -433,7 +433,7 @@ class TestProcessList(TestCase):
start = time.time()
while proc.is_alive():
if time.time() - start > timeout:
raise TimeoutError("Process did not finishe before timeout")
raise Exception("Process did not finishe before timeout")
time.sleep(.3)
def test_process_list_process(self):