refactor

1 files changed, 2 insertions, 16 deletions

diff --git a/psutil/tests/__init__.py b/psutil/tests/__init__.py
index 077eca22..3c1d9015 100644
--- a/psutil/tests/__init__.py
+++ b/psutil/tests/__init__.py
@@ -458,21 +458,6 @@ def sh(cmd, **kwds):
     return stdout
 
 
-def _assert_no_pid(pid):
-    # This is here to make sure wait_procs() behaves properly and
-    # investigate:
-    # https://ci.appveyor.com/project/giampaolo/psutil/build/job/
-    #     jiq2cgd6stsbtn60
-    assert not psutil.pid_exists(pid), pid
-    assert pid not in psutil.pids(), pid
-    try:
-        p = psutil.Process(pid)
-    except psutil.NoSuchProcess:
-        pass
-    else:
-        assert 0, "%s is still alive" % p
-
-
 def terminate(proc_or_pid, sig=signal.SIGTERM, wait_timeout=GLOBAL_TIMEOUT):
     """Terminate a process and wait() for it.
     Process can be a PID or an instance of psutil.Process(),
@@ -550,7 +535,8 @@ def terminate(proc_or_pid, sig=signal.SIGTERM, wait_timeout=GLOBAL_TIMEOUT):
     finally:
         if isinstance(p, (subprocess.Popen, psutil.Popen)):
             flush_popen(p)
-        _assert_no_pid(p if isinstance(p, int) else p.pid)
+        pid = p if isinstance(p, int) else p.pid
+        assert not psutil.pid_exists(pid), pid
 
 
 def reap_children(recursive=False):