diff options
Diffstat (limited to 'psutil/tests/__init__.py')
| -rw-r--r-- | psutil/tests/__init__.py | 7 |
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") |