Android: kill leftover webpagereplay servers.

build/android/pylib/utils/test_environment.py

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import logging
 import os
 import psutil
+import signal
 
 from pylib import android_commands
 
 def _KillWebServers():
   for retry in xrange(5):
-    for server in ['lighttpd', 'web-page-replay']:
-      pids = [p.pid for p in psutil.process_iter() if server in p.name]
-      for pid in pids:
+    for server in ['lighttpd', 'web-page-replay', 'webpagereplay']:

[tonyg, 2013/12/06 17:49:53]

Do we really need both with and without the dashes? If so, maybe add a comment?

[bulach, 2013/12/06 18:12:56]

right, I think at some point it had the dashes, but that's no longer the case..
removed it.

+      for p in psutil.process_iter():
         try:
-          logging.warning('Killing %s %s', server, pid)
-          os.kill(pid, signal.SIGQUIT)
+          if not server in ' '.join(p.cmdline):
+            continue
+          logging.warning('Killing %s %s', server, p.pid)
+          p.send_signal(signal.SIGQUIT)
+          p.wait(1)

[tonyg, 2013/12/06 17:49:53]

I didn't think wait took args. What does this do?

[tonyg, 2013/12/06 17:49:53]

Let's parallelize this by having two loops. The first loops sends all the
signals, the second loop does all the waits.

[bulach, 2013/12/06 18:12:56]

good idea!
the arg is a timeout for waiting the process to finish...
I also changed and rather than 5 retries with SIGQUIT, it's now trying
increasingly more menacing signals :)

         except Exception as e:
-          logging.warning('Failed killing %s %s %s', server, pid, e)
+          logging.warning('Failed killing %s %s %s', server, p.pid, e)
 
 
 def CleanupLeftoverProcesses():
   """Clean up the test environment, restarting fresh adb and HTTP daemons."""
   _KillWebServers()
   did_restart_host_adb = False
   for device in android_commands.GetAttachedDevices():
     adb = android_commands.AndroidCommands(device, api_strict_mode=True)
     # Make sure we restart the host adb server only once.
     if not did_restart_host_adb:
       adb.RestartAdbServer()
       did_restart_host_adb = True
     adb.RestartAdbdOnDevice()
     adb.EnableAdbRoot()
     adb.WaitForDevicePm()