get rid of some reap_children() occurrences

2 files changed, 5 insertions, 11 deletions

diff --git a/psutil/tests/test_unicode.py b/psutil/tests/test_unicode.py
index 926acfb7..59dc52e6 100644
--- a/psutil/tests/test_unicode.py
+++ b/psutil/tests/test_unicode.py
@@ -100,7 +100,6 @@ from psutil.tests import HAS_MEMORY_MAPS
 from psutil.tests import INVALID_UNICODE_SUFFIX
 from psutil.tests import PsutilTestCase
 from psutil.tests import PYPY
-from psutil.tests import reap_children
 from psutil.tests import safe_mkdir
 from psutil.tests import safe_rmpath
 from psutil.tests import serialrun
@@ -169,7 +168,6 @@ class _BaseFSAPIsTests(object):
 
     @classmethod
     def tearDownClass(cls):
-        reap_children()
         safe_rmpath(cls.funky_name)
 
     def expect_exact_path_match(self):
@@ -340,9 +338,6 @@ class TestFSAPIsWithInvalidPath(_BaseFSAPIsTests, PsutilTestCase):
 class TestNonFSAPIS(PsutilTestCase):
     """Unicode tests for non fs-related APIs."""
 
-    def tearDown(self):
-        reap_children()
-
     @unittest.skipIf(not HAS_ENVIRON, "not supported")
     @unittest.skipIf(PYPY and WINDOWS, "segfaults on PYPY + WINDOWS")
     def test_proc_environ(self):
diff --git a/psutil/tests/test_windows.py b/psutil/tests/test_windows.py
index 0c5faf18..03fd5f9a 100755
--- a/psutil/tests/test_windows.py
+++ b/psutil/tests/test_windows.py
@@ -22,6 +22,7 @@ import warnings
 import psutil
 from psutil import WINDOWS
 from psutil._compat import FileNotFoundError
+from psutil._compat import super
 from psutil.tests import APPVEYOR
 from psutil.tests import get_test_subprocess
 from psutil.tests import HAS_BATTERY
@@ -29,7 +30,6 @@ from psutil.tests import mock
 from psutil.tests import PsutilTestCase
 from psutil.tests import PY3
 from psutil.tests import PYPY
-from psutil.tests import reap_children
 from psutil.tests import retry_on_failure
 from psutil.tests import sh
 from psutil.tests import terminate
@@ -537,7 +537,7 @@ class TestProcessWMI(TestCase):
 
     @classmethod
     def tearDownClass(cls):
-        reap_children()
+        terminate(cls.pid)
 
     def test_name(self):
         w = wmi.WMI().Win32_Process(ProcessId=self.pid)[0]
@@ -696,6 +696,7 @@ class RemotePsutilTestCase(PsutilTestCase):
                                     stdout=subprocess.PIPE,
                                     stderr=subprocess.STDOUT)
             output, _ = proc.communicate()
+            proc.wait()
             if output == str(not IS_64_BIT):
                 return filename
 
@@ -717,6 +718,7 @@ class RemotePsutilTestCase(PsutilTestCase):
     test_args = ["-c", "import sys; sys.stdin.read()"]
 
     def setUp(self):
+        super().setUp()
         env = os.environ.copy()
         env["THINK_OF_A_NUMBER"] = str(os.getpid())
         self.proc32 = self.get_test_subprocess(
@@ -729,13 +731,10 @@ class RemotePsutilTestCase(PsutilTestCase):
             stdin=subprocess.PIPE)
 
     def tearDown(self):
+        super().tearDown()
         self.proc32.communicate()
         self.proc64.communicate()
 
-    @classmethod
-    def tearDownClass(cls):
-        reap_children()
-
     def test_cmdline_32(self):
         p = psutil.Process(self.proc32.pid)
         self.assertEqual(len(p.cmdline()), 3)