diff options
| author | hartmanng@chromium.org <hartmanng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-08 22:21:08 +0000 |
|---|---|---|
| committer | hartmanng@chromium.org <hartmanng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-08 22:21:08 +0000 |
| commit | cc8f5e62b097459556efbe97943eb03f4f2fbf1a (patch) | |
| tree | 59827d7f7e469619b39ae63af8192a7187453974 /tools | |
| parent | 77b5550594951087e98ed807000e82fba203a308 (diff) | |
| download | chromium_src-cc8f5e62b097459556efbe97943eb03f4f2fbf1a.zip chromium_src-cc8f5e62b097459556efbe97943eb03f4f2fbf1a.tar.gz chromium_src-cc8f5e62b097459556efbe97943eb03f4f2fbf1a.tar.bz2 | |
Fixing benchmark crash on blackboard.com.
This site was sometimes timing out during the first request, which produced an
uncaught exception in our framework. It should now fail the site gracefully
and continue with the rest of the pageset.
BUG=159597
Review URL: https://chromiumcodereview.appspot.com/11362160
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166778 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/telemetry/telemetry/browser_backend.py | 3 | ||||
| -rw-r--r-- | tools/telemetry/telemetry/page_runner.py | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/tools/telemetry/telemetry/browser_backend.py b/tools/telemetry/telemetry/browser_backend.py index 52fbdb2..79974bd 100644 --- a/tools/telemetry/telemetry/browser_backend.py +++ b/tools/telemetry/telemetry/browser_backend.py @@ -105,7 +105,8 @@ class BrowserBackend(object): def DoesDebuggerUrlExist(self, url): matches = [t for t in self._ListTabs() - if t['webSocketDebuggerUrl'] == url] + if 'webSocketDebuggerUrl' in t and\ + t['webSocketDebuggerUrl'] == url] return len(matches) >= 1 def CreateForwarder(self, host_port): diff --git a/tools/telemetry/telemetry/page_runner.py b/tools/telemetry/telemetry/page_runner.py index 2fd7ee3..cbf47f1 100644 --- a/tools/telemetry/telemetry/page_runner.py +++ b/tools/telemetry/telemetry/page_runner.py @@ -106,6 +106,11 @@ http://goto/read-src-internal, or create a new archive using --record. page_state = PageState() try: did_prepare = self.PreparePage(page, tab, page_state, results) + except util.TimeoutException, ex: + logging.warning('TimedOut waiting for reply on %s. This is unusual.', + page.url) + results.AddFailure(page, ex, traceback.format_exc()) + return except Exception, ex: logging.error('Unexpected failure while running %s: %s', page.url, traceback.format_exc()) |