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 #53750 from twangboy/fix_helpers

Browse source 
Fix memory error when the test suite cleans up (2019.2.1)
This commit is contained in:
Daniel Wozniak 2019-07-16 16:00:06 -07:00 • committed by GitHub
commit 317d9af694
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/support/helpers.py
View file

@ -1215,6 +1215,8 @@ def _terminate_process_list(process_list, kill=False, slow_stop=False):
except psutil.AccessDenied:
# OSX is more restrictive about the above information
cmdline = None
except OSError:
cmdline = None
if not cmdline:
try:
cmdline = process.as_dict()