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

Catch shutdown error in test suite (#35933)

Browse Source 
Change made per @s0undt3ch
This commit is contained in:
Mike Place 2016-09-01 00:35:20 +09:00 committed by Nicole Thomas
parent 24920aa226
commit 6bcd76bfce
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/integration/__init__.py
View File

@ -120,7 +120,10 @@ except ImportError:
if process and only_children is False:
cmdline = process.cmdline()
if not cmdline:
cmdline = process.as_dict()
try:
cmdline = process.as_dict()
except psutil.NoSuchProcess as exc:
log.debug('No such process found. Stacktrace: {0}'.format(exc))
log.info('Sending %s to process: %s', sigint_name, cmdline)
process.send_signal(sigint)