summaryrefslogtreecommitdiffstats
path: root/tools/chrome_proxy
diff options
context:
space:
mode:
authorsclittle <sclittle@chromium.org>2014-11-12 14:24:32 -0800
committerCommit bot <commit-bot@chromium.org>2014-11-12 22:25:48 +0000
commit7f677bfffbbf2b80ed4d32da2acb9b865af032cb (patch)
tree624f39733011e4dbce95be517dc843341701d2ed /tools/chrome_proxy
parent0c2789bbadee042299cf4e6268287af66ee53bbc (diff)
downloadchromium_src-7f677bfffbbf2b80ed4d32da2acb9b865af032cb.zip
chromium_src-7f677bfffbbf2b80ed4d32da2acb9b865af032cb.tar.gz
chromium_src-7f677bfffbbf2b80ed4d32da2acb9b865af032cb.tar.bz2
Change DRP telemetry test for CORS bypasses to timeout sooner.
The units for the timeout are seconds, so reduce the timeout from 4 hours down to 5 minutes. BUG=431933 Review URL: https://codereview.chromium.org/707783003 Cr-Commit-Position: refs/heads/master@{#303904}
Diffstat (limited to 'tools/chrome_proxy')
-rw-r--r--tools/chrome_proxy/integration_tests/chrome_proxy_measurements.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/chrome_proxy/integration_tests/chrome_proxy_measurements.py b/tools/chrome_proxy/integration_tests/chrome_proxy_measurements.py
index be67426..8227a94 100644
--- a/tools/chrome_proxy/integration_tests/chrome_proxy_measurements.py
+++ b/tools/chrome_proxy/integration_tests/chrome_proxy_measurements.py
@@ -121,7 +121,7 @@ class ChromeProxyCorsBypass(ChromeProxyValidation):
def ValidateAndMeasurePage(self, page, tab, results):
# The test page sets window.xhrRequestCompleted to true when the XHR fetch
# finishes.
- tab.WaitForJavaScriptExpression('window.xhrRequestCompleted', 15000)
+ tab.WaitForJavaScriptExpression('window.xhrRequestCompleted', 300)
super(ChromeProxyCorsBypass,
self).ValidateAndMeasurePage(page, tab, results)