summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2020-04-30 07:24:48 -0700
committerGiampaolo Rodola <g.rodola@gmail.com>2020-04-30 07:24:48 -0700
commitf58d0dd478dcbf4140b0b690da4c8ea669c2c7b6 (patch)
tree78c223cc770ac8746d2f34ebdc9dd58ee4b27a89
parent42f2f76ad0b7e1187dbc41ca7686bdc8d1ba1cab (diff)
downloadpsutil-f58d0dd478dcbf4140b0b690da4c8ea669c2c7b6.tar.gz
change create_proc_children_pair()
-rw-r--r--psutil/tests/test_testutils.py28
1 files changed, 14 insertions, 14 deletions
diff --git a/psutil/tests/test_testutils.py b/psutil/tests/test_testutils.py
index d466dcf2..50daa50c 100644
--- a/psutil/tests/test_testutils.py
+++ b/psutil/tests/test_testutils.py
@@ -220,23 +220,23 @@ class TestProcessUtils(PsutilTestCase):
assert not psutil.tests._subprocesses_started
def test_create_proc_children_pair(self):
- p1, p2 = self.create_proc_children_pair()
- self.assertNotEqual(p1.pid, p2.pid)
- assert p1.is_running()
- assert p2.is_running()
+ child, grandchild = self.create_proc_children_pair()
+ self.assertNotEqual(child.pid, grandchild.pid)
+ assert child.is_running()
+ assert grandchild.is_running()
children = psutil.Process().children(recursive=True)
self.assertEqual(len(children), 2)
- self.assertIn(p1, children)
- self.assertIn(p2, children)
- self.assertEqual(p1.ppid(), os.getpid())
- self.assertEqual(p2.ppid(), p1.pid)
+ self.assertIn(child, children)
+ self.assertIn(grandchild, children)
+ self.assertEqual(child.ppid(), os.getpid())
+ self.assertEqual(grandchild.ppid(), child.pid)
- # make sure both of them are cleaned up
- reap_children()
- assert not p1.is_running()
- assert not p2.is_running()
- assert not psutil.tests._pids_started
- assert not psutil.tests._subprocesses_started
+ terminate(child)
+ assert not child.is_running()
+ assert grandchild.is_running()
+
+ terminate(grandchild)
+ assert not grandchild.is_running()
@unittest.skipIf(not POSIX, "POSIX only")
def test_create_zombie_proc(self):