diff options
| author | achuith@chromium.org <achuith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-08 23:16:21 +0000 |
|---|---|---|
| committer | achuith@chromium.org <achuith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-08 23:16:21 +0000 |
| commit | cb99213a48d2bdf70853e555b789faa66095ba11 (patch) | |
| tree | fb3144fef627c0e7f5543c47a3a25866aa176c5e /tools | |
| parent | ab1aa8368615e8b589d135d24ae370ddd19b464f (diff) | |
| download | chromium_src-cb99213a48d2bdf70853e555b789faa66095ba11.zip chromium_src-cb99213a48d2bdf70853e555b789faa66095ba11.tar.gz chromium_src-cb99213a48d2bdf70853e555b789faa66095ba11.tar.bz2 | |
Catch TabCrashException that may occur as we poll for oobe disappearing.
We access oobe here as it is going away: https://code.google.com/p/chromium/codesearch#chromium/src/tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py&q=oobe&l=343
BUG=chromium:332545
TEST=manual
NOTRY=True
Review URL: https://codereview.chromium.org/129343003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243690 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/telemetry/telemetry/core/backends/chrome/misc_web_contents_backend.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/telemetry/telemetry/core/backends/chrome/misc_web_contents_backend.py b/tools/telemetry/telemetry/core/backends/chrome/misc_web_contents_backend.py index f2327c0..891366b 100644 --- a/tools/telemetry/telemetry/core/backends/chrome/misc_web_contents_backend.py +++ b/tools/telemetry/telemetry/core/backends/chrome/misc_web_contents_backend.py @@ -3,6 +3,7 @@ # found in the LICENSE file. import json +from telemetry.core import exceptions from telemetry.core import web_contents from telemetry.core.backends.chrome import inspector_backend @@ -17,7 +18,10 @@ class MiscWebContentsBackend(object): if oobe_web_contents_info: debugger_url = oobe_web_contents_info.get('webSocketDebuggerUrl') if debugger_url: - inspector = self._CreateInspectorBackend(debugger_url) + try: + inspector = self._CreateInspectorBackend(debugger_url) + except exceptions.TabCrashException: + return None return web_contents.WebContents(inspector) return None |