diff options
| author | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-04 18:58:29 +0000 |
|---|---|---|
| committer | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-04 18:58:29 +0000 |
| commit | 82278d4ad8d2d516ad865d8e49d4226aa958cc1c (patch) | |
| tree | a7006261ea1a6a64ee1a075d420ae37ef78d67d4 | |
| parent | 2499c79dc5ec454f6f16f1932c7d3ecbdd4dc506 (diff) | |
| download | chromium_src-82278d4ad8d2d516ad865d8e49d4226aa958cc1c.zip chromium_src-82278d4ad8d2d516ad865d8e49d4226aa958cc1c.tar.gz chromium_src-82278d4ad8d2d516ad865d8e49d4226aa958cc1c.tar.bz2 | |
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
Review URL: https://codereview.chromium.org/48523003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232750 0039d316-1c4b-4281-b951-d872f2087c98
| -rwxr-xr-x | build/android/buildbot/bb_device_status_check.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/build/android/buildbot/bb_device_status_check.py b/build/android/buildbot/bb_device_status_check.py index d01fcaa..67020d6 100755 --- a/build/android/buildbot/bb_device_status_check.py +++ b/build/android/buildbot/bb_device_status_check.py @@ -256,8 +256,11 @@ def RestartUsb(): 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(): @@ -268,7 +271,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(): |