diff options
Diffstat (limited to 'chromium/tools/chrome_proxy/integration_tests/chrome_proxy_measurements.py')
-rw-r--r-- | chromium/tools/chrome_proxy/integration_tests/chrome_proxy_measurements.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/chromium/tools/chrome_proxy/integration_tests/chrome_proxy_measurements.py b/chromium/tools/chrome_proxy/integration_tests/chrome_proxy_measurements.py index 6754a60fae6..7b07d760fe4 100644 --- a/chromium/tools/chrome_proxy/integration_tests/chrome_proxy_measurements.py +++ b/chromium/tools/chrome_proxy/integration_tests/chrome_proxy_measurements.py @@ -47,7 +47,8 @@ class ChromeProxyDataSaving(legacy_page_test.LegacyPageTest): def ValidateAndMeasurePage(self, page, tab, results): # Wait for the load event. - tab.WaitForJavaScriptExpression('performance.timing.loadEventStart', 300) + tab.WaitForJavaScriptCondition( + 'performance.timing.loadEventStart', timeout=300) self._metrics.Stop(page, tab) self._metrics.AddResultsForDataSaving(tab, results) @@ -123,7 +124,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', 300) + tab.WaitForJavaScriptCondition('window.xhrRequestCompleted', timeout=300) super(ChromeProxyCorsBypass, self).ValidateAndMeasurePage(page, tab, results) @@ -501,7 +502,8 @@ class ChromeProxyHTTPToDirectFallback(ChromeProxyValidation): # cause a proxy fallback, and have this test run starting from the HTTP # fallback proxy. tab.Navigate(_TEST_SERVER_DEFAULT_URL) - tab.WaitForJavaScriptExpression('performance.timing.loadEventStart', 300) + tab.WaitForJavaScriptCondition( + 'performance.timing.loadEventStart', timeout=300) def AddResults(self, tab, results): self._metrics.AddResultsForHTTPToDirectFallback(tab, results, _TEST_SERVER) @@ -602,7 +604,8 @@ class ChromeProxyQuicSmoke(legacy_page_test.LegacyPageTest): def ValidateAndMeasurePage(self, page, tab, results): # Wait for the load event. - tab.WaitForJavaScriptExpression('performance.timing.loadEventStart', 300) + tab.WaitForJavaScriptCondition( + 'performance.timing.loadEventStart', timeout=300) self._metrics.Stop(page, tab) page_to_metrics = { 'header validation': [self._metrics.AddResultsForHeaderValidation], @@ -800,6 +803,7 @@ class ChromeProxyQuicTransaction(legacy_page_test.LegacyPageTest): def ValidateAndMeasurePage(self, page, tab, results): # Wait for the load event. - tab.WaitForJavaScriptExpression('performance.timing.loadEventStart', 300) + tab.WaitForJavaScriptCondition( + 'performance.timing.loadEventStart', timeout=300) self._metrics.Stop(page, tab) self._metrics.AddResultsForQuicTransaction(tab, results) |