Android: further fixes to bb_device_status_check.py

Android: further fixes to bb_device_status_check.py

The "p." properties are actually functions that can raise NoSuchProcess.
Capture that exception.

BUG=
TBR=navabi@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=232750

[bulach, 2013-10-28 13:57:26]

ptal

[Dominik Grewe, 2013-10-28 14:03:30]

lgtm, thanks.

[bulach, 2013-10-30 23:31:20]

navabi: ping? :)

[navabi, 2013-10-30 23:36:06]

On 2013/10/30 23:31:20, bulach wrote:
> navabi: ping? :)

sorry, this got lost. lgtm. thanks.

[commit-bot: I haz the power, 2013-10-31 08:25:36]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/bulach@chromium.org/48523003/1

[commit-bot: I haz the power, 2013-10-31 08:40:09]

Retried try job too often on chromium_presubmit for step(s) presubmit
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=chromium_p...

[commit-bot: I haz the power, 2013-11-04 10:39:56]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/bulach@chromium.org/48523003/1

[commit-bot: I haz the power, 2013-11-04 10:39:58]

Failed to apply patch for build/android/buildbot/bb_device_status_check.py:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file build/android/buildbot/bb_device_status_check.py
  Hunk #1 FAILED at 246.
  Hunk #2 succeeded at 268 (offset 10 lines).
  1 out of 2 hunks FAILED -- saving rejects to file
build/android/buildbot/bb_device_status_check.py.rej

Patch:       build/android/buildbot/bb_device_status_check.py
Index: build/android/buildbot/bb_device_status_check.py
diff --git a/build/android/buildbot/bb_device_status_check.py
b/build/android/buildbot/bb_device_status_check.py
index
b43ee0a99b9f189d3343639cdd8015bc4b9782a6..14f29c817d49cf7766d766a637ae07096bd6975e
100755
--- a/build/android/buildbot/bb_device_status_check.py
+++ b/build/android/buildbot/bb_device_status_check.py
@@ -246,8 +246,11 @@ def RestartUsb():
 def KillAllAdb():
   def GetAllAdb():
     for p in psutil.process_iter():
-      if 'adb' in p.name or 'adb' in ' '.join(p.cmdline):
-        yield p
+      try:
+        if 'adb' in p.name or 'adb' in ' '.join(p.cmdline):
+          yield p
+      except psutil.error.NoSuchProcess:
+        pass
 
   for sig in [signal.SIGTERM, signal.SIGQUIT, signal.SIGKILL]:
     for p in GetAllAdb():
@@ -258,7 +261,10 @@ def KillAllAdb():
       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():

[commit-bot: I haz the power, 2013-11-04 10:48:36]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/bulach@chromium.org/48523003/160001

[commit-bot: I haz the power, 2013-11-04 12:42:40]

Retried try job too often on win_rel for step(s) content_unittests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_rel&nu...

[commit-bot: I haz the power, 2013-11-04 17:41:00]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/bulach@chromium.org/48523003/160001

[commit-bot: I haz the power, 2013-11-04 18:58:33]

Change committed as 232750