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

Try/except psutil process access in OSX

Browse Source 
Refs https://github.com/saltstack/qa/issues/244
This commit is contained in:
Mike Place 2016-09-20 14:35:25 +09:00
parent 098cf87a6b
commit d0f44c95f5
No known key found for this signature in database
GPG Key ID: 9136F4F13705CFD3
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/integration/__init__.py
View File

@ -184,10 +184,16 @@ except ImportError:
kill_children(children)
if children:
psutil.wait_procs(children, timeout=10, callback=lambda proc: kill_children(children, terminate=True))
try:
psutil.wait_procs(children, timeout=10, callback=lambda proc: kill_children(children, terminate=True))
except psutil.AccessDenied:
kill_children(children, terminate=True)
if children:
psutil.wait_procs(children, timeout=5, callback=lambda proc: kill_children(children, kill=True))
try:
psutil.wait_procs(children, timeout=5, callback=lambda proc: kill_children(children, kill=True))
except psutils.AccessDenied:
kill_children(children, kill=True)
SYS_TMP_DIR = os.path.realpath(
# Avoid ${TMPDIR} and gettempdir() on MacOS as they yield a base path too long