diff options
| author | tonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-03 18:57:13 +0000 |
|---|---|---|
| committer | tonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-03 18:57:13 +0000 |
| commit | 47914ce872d5e3c1901eeeb44c02dd197c01992d (patch) | |
| tree | b80581b16d54bb052c20a0b6efc96283a767361e /tools/telemetry | |
| parent | 6ee126d275be184cba074f2638d122c0a3d774ef (diff) | |
| download | chromium_src-47914ce872d5e3c1901eeeb44c02dd197c01992d.zip chromium_src-47914ce872d5e3c1901eeeb44c02dd197c01992d.tar.gz chromium_src-47914ce872d5e3c1901eeeb44c02dd197c01992d.tar.bz2 | |
[Telemetry] Fix timeout on XP moz page cycler.
It appears we were occassionally hitting the temporary http server startup
timeout on the first run after rebooting on xp. Fix this by doubling the
timeout.
This was difficult to track down because the error message was misleading. It
just said:
Timed out waiting for reply on file:///../../../../data/page_cycler/moz/bugzilla.mozilla.org/. This is unusual.
So fix the error message to say:
Timed out while waiting 10s for IsServerUp. Timeout occurred during page file:///../../../../data/page_cycler/moz/bugzilla.mozilla.org/
BUG=237838
TEST=moz page cycler on xp, win7 and linux
NOTRY=True
Review URL: https://chromiumcodereview.appspot.com/14927004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198150 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/telemetry')
| -rw-r--r-- | tools/telemetry/telemetry/core/temporary_http_server.py | 2 | ||||
| -rw-r--r-- | tools/telemetry/telemetry/page/page_runner.py | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/tools/telemetry/telemetry/core/temporary_http_server.py b/tools/telemetry/telemetry/core/temporary_http_server.py index 4e32214..e6dd42c 100644 --- a/tools/telemetry/telemetry/core/temporary_http_server.py +++ b/tools/telemetry/telemetry/core/temporary_http_server.py @@ -35,7 +35,7 @@ class TemporaryHTTPServer(object): def IsServerUp(): return not socket.socket().connect_ex(('localhost', self._host_port)) - util.WaitFor(IsServerUp, 5) + util.WaitFor(IsServerUp, 10) @property def paths(self): diff --git a/tools/telemetry/telemetry/page/page_runner.py b/tools/telemetry/telemetry/page/page_runner.py index 11763a2..8ba9030 100644 --- a/tools/telemetry/telemetry/page/page_runner.py +++ b/tools/telemetry/telemetry/page/page_runner.py @@ -227,8 +227,7 @@ class PageRunner(object): try: did_prepare = self._PreparePage(page, tab, page_state, test, results) except util.TimeoutException, ex: - logging.warning('Timed out waiting for reply on %s. This is unusual.', - page.url) + logging.error(str(ex) + ' Timeout occurred during page %s', page.url) results.AddFailure(page, ex, traceback.format_exc()) return except exceptions.TabCrashException, ex: |