summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2020-05-18 17:12:14 +0200
committerGiampaolo Rodola <g.rodola@gmail.com>2020-05-18 17:12:14 +0200
commit291d9c9c766eae248e4394b6e03666dbafe45677 (patch)
tree4072ffad33ad2f7055ec12c3ae3bd23da622d110
parent51c97dc5d98ebfebcc2fde4060f182ae19b76be1 (diff)
downloadpsutil-291d9c9c766eae248e4394b6e03666dbafe45677.tar.gz
refactor FetchAll test
-rwxr-xr-xpsutil/tests/test_contracts.py12
1 files changed, 4 insertions, 8 deletions
diff --git a/psutil/tests/test_contracts.py b/psutil/tests/test_contracts.py
index 29e1b719..a57e19e9 100755
--- a/psutil/tests/test_contracts.py
+++ b/psutil/tests/test_contracts.py
@@ -331,9 +331,9 @@ def proc_info(pid):
tcase.assertEqual(exc.pid, pid)
tcase.assertEqual(exc.name, name)
if isinstance(exc, psutil.ZombieProcess):
- # XXX investigate zombie/ppid relation on POSIX
- # tcase.assertEqual(exc.ppid, ppid)
- pass
+ if exc.ppid is not None:
+ tcase.assertGreaterEqual(exc.ppid, 0)
+ tcase.assertEqual(exc.ppid, ppid)
elif isinstance(exc, psutil.NoSuchProcess):
tcase.assertProcessGone(proc)
str(exc)
@@ -359,11 +359,7 @@ def proc_info(pid):
for fun, fun_name in ns.iter(ns.getters, clear_cache=False):
try:
info[fun_name] = fun()
- except psutil.NoSuchProcess as exc:
- check_exception(exc, proc, name, ppid)
- do_wait()
- return info
- except psutil.AccessDenied as exc:
+ except psutil.Error as exc:
check_exception(exc, proc, name, ppid)
continue
do_wait()