Android: further fixes to bb_device_status_check.py

build/android/buildbot/bb_device_status_check.py

 #!/usr/bin/env python
 #
 # 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.
 
 """A class to keep track of devices across builds and report state."""
 import logging
 import optparse
 import os
@@ skipping 238 matching lines @@
 
   if failed_restart:
     return 1
 
   return 0
 
 
 def KillAllAdb():
   def GetAllAdb():
     for p in psutil.process_iter():
-      if 'adb' in p.name:
-        yield p
+      try:
+        if 'adb' in p.name:
+          yield p
+      except psutil.error.NoSuchProcess:
+        pass
 
   for sig in [signal.SIGTERM, signal.SIGQUIT, signal.SIGKILL]:
     for p in GetAllAdb():
       try:
         print 'kill %d %d (%s [%s])' % (sig, p.pid, p.name,
             ' '.join(p.cmdline))
         p.send_signal(sig)
       except psutil.error.NoSuchProcess:
         pass
   for p in GetAllAdb():
-    print 'Unable to kill %d (%s [%s])' % (p.pid, p.name, ' '.join(p.cmdline))
+    try:
+      print 'Unable to kill %d (%s [%s])' % (p.pid, p.name, ' '.join(p.cmdline))
+    except psutil.error.NoSuchProcess:
+      pass
 
 
 def main():
   parser = optparse.OptionParser()
   parser.add_option('', '--out-dir',
                     help='Directory where the device path is stored',
                     default=os.path.join(constants.DIR_SOURCE_ROOT, 'out'))
   parser.add_option('--no-provisioning-check', action='store_true',
                     help='Will not check if devices are provisioned properly.')
   parser.add_option('--device-status-dashboard', action='store_true',
@@ skipping 68 matching lines @@
     # devices with critically low battery or install speed. Remove those devices
     # from testing, allowing build to continue with good devices.
     return 1
 
   if not devices:
     return 1
 
 
 if __name__ == '__main__':
   sys.exit(main())