diff options
| author | achuith@chromium.org <achuith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-23 00:16:04 +0000 |
|---|---|---|
| committer | achuith@chromium.org <achuith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-23 00:16:04 +0000 |
| commit | a4984a653416b273f7ed9639ae282a57009c9692 (patch) | |
| tree | 7c421cdfa818c6239183596792d8357acafa56d7 /tools/telemetry | |
| parent | d5687c7239d8964b09b892968ea9ae872258e119 (diff) | |
| download | chromium_src-a4984a653416b273f7ed9639ae282a57009c9692.zip chromium_src-a4984a653416b273f7ed9639ae282a57009c9692.tar.gz chromium_src-a4984a653416b273f7ed9639ae282a57009c9692.tar.bz2 | |
Raise TabCrashException in _Connect.
This exception is raised in oobe navigation on cros. The oobe might be going away as we try to connect to it.
BUG=228970
TEST=unit tests on cros
Review URL: https://codereview.chromium.org/13974006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195651 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/telemetry')
| -rw-r--r-- | tools/telemetry/telemetry/core/chrome/inspector_backend.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tools/telemetry/telemetry/core/chrome/inspector_backend.py b/tools/telemetry/telemetry/core/chrome/inspector_backend.py index c10e987..cca55c8 100644 --- a/tools/telemetry/telemetry/core/chrome/inspector_backend.py +++ b/tools/telemetry/telemetry/core/chrome/inspector_backend.py @@ -42,7 +42,14 @@ class InspectorBackend(object): def _Connect(self): if self._socket: return - self._socket = websocket.create_connection(self._debugger_url) + try: + self._socket = websocket.create_connection(self._debugger_url) + except (websocket.WebSocketException): + if self._browser_backend.IsBrowserRunning(): + raise exceptions.TabCrashException() + else: + raise exceptions.BrowserGoneException() + self._cur_socket_timeout = 0 self._next_request_id = 0 |