summaryrefslogtreecommitdiff
path: root/psutil/tests/__init__.py
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2020-05-02 15:32:17 +0200
committerGiampaolo Rodola <g.rodola@gmail.com>2020-05-02 15:32:17 +0200
commitd090aac2ce9aa46ee469d4c0c14fc21061b78d72 (patch)
tree17a33f4656be58c9ae98106d25eeb176d6bbdfc9 /psutil/tests/__init__.py
parentd7afd749a84510da139679be684ff4f6f79fa330 (diff)
downloadpsutil-wait-exit-code.tar.gz
Enhance Process repr and add exit codewait-exit-code
Show exit code if wait() was used and also use cached name if name() fails.
Diffstat (limited to 'psutil/tests/__init__.py')
-rw-r--r--psutil/tests/__init__.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/psutil/tests/__init__.py b/psutil/tests/__init__.py
index ed06df77..ffb73f5b 100644
--- a/psutil/tests/__init__.py
+++ b/psutil/tests/__init__.py
@@ -874,17 +874,14 @@ class PsutilTestCase(TestCase):
self.addCleanup(terminate, sproc) # executed first
return sproc
- def assertPidGone(self, pid):
- assert not psutil.pid_exists(pid), pid
- self.assertNotIn(pid, psutil.pids())
-
def assertProcessGone(self, proc):
self.assertRaises(psutil.NoSuchProcess, psutil.Process, proc.pid)
if isinstance(proc, (psutil.Process, psutil.Popen)):
assert not proc.is_running()
self.assertRaises(psutil.NoSuchProcess, proc.status)
proc.wait(timeout=0) # assert not raise TimeoutExpired
- self.assertPidGone(proc.pid)
+ assert not psutil.pid_exists(proc.pid), proc.pid
+ self.assertNotIn(proc.pid, psutil.pids())
@unittest.skipIf(PYPY, "unreliable on PYPY")