diff options
author | bustamante <bustamante@google.com> | 2015-09-21 15:39:25 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-09-21 22:40:07 +0000 |
commit | b27d6c92ef8c0c28cb721e1f923ce84883d92c23 (patch) | |
tree | 2d10ed52ba10f7d2a20cc0648682d9022aa7306c /tools/chrome_proxy | |
parent | 595afa32c4ca76670fcd8801630048641435b252 (diff) | |
download | chromium_src-b27d6c92ef8c0c28cb721e1f923ce84883d92c23.zip chromium_src-b27d6c92ef8c0c28cb721e1f923ce84883d92c23.tar.gz chromium_src-b27d6c92ef8c0c28cb721e1f923ce84883d92c23.tar.bz2 |
Verify the page has begun loading before doing a DRP check.
In the chrome_proxy_benchmark.client_version.synthetic test it will
consistently try to make the DRP check before the javascript in the page
has been loaded, causing the case to fail.
BUG=533730
Review URL: https://codereview.chromium.org/1360673002
Cr-Commit-Position: refs/heads/master@{#350049}
Diffstat (limited to 'tools/chrome_proxy')
-rw-r--r-- | tools/chrome_proxy/common/chrome_proxy_measurements.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/chrome_proxy/common/chrome_proxy_measurements.py b/tools/chrome_proxy/common/chrome_proxy_measurements.py index 542f746..7cdef14 100644 --- a/tools/chrome_proxy/common/chrome_proxy_measurements.py +++ b/tools/chrome_proxy/common/chrome_proxy_measurements.py @@ -35,6 +35,8 @@ def WaitForViaHeader(tab, url="http://check.googlezip.net/test.html"): 'Waiting for Chrome to start using the DRP...' '</body></html>')) + # Ensure the page has started loading before attempting the DRP check. + tab.WaitForJavaScriptExpression('performance.timing.loadEventStart', 300) tab.WaitForJavaScriptExpression( 'ProbeViaHeader("%s", "%s")' % (url, metrics.CHROME_PROXY_VIA_HEADER), 300) |