saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-16 17:50:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Dont fail just because some random process died

Browse source
This commit is contained in:
Daniel A. Wozniak 2019-04-27 04:57:56 +00:00 • committed by Pedro Algarvio
parent 34cef86e14
commit 522599d261
No known key found for this signature in database
GPG key ID: BB36BF6584A298FF
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tests/support/gitfs.py
View file

@ -86,11 +86,16 @@ class ProcessManager(object):
raise ValueError('one of name or search is required')
for proc in psutil.process_iter():
if name is not None:
if search is None:
if name in proc.name():
try:
if search is None:
if name in proc.name():
return proc
elif name in proc.name() and _search(proc):
return proc
elif name in proc.name() and _search(proc):
return proc
except psutil.NoSuchProcess:
# Whichever process we are interigating is no longer alive.
# Skip it and keep searching.
continue
else:
if _search(proc):
return proc