diff options
| author | nednguyen <nednguyen@google.com> | 2015-05-19 14:54:08 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-19 21:54:18 +0000 |
| commit | 60c3db53394bdba955667eaecc312695f65c8766 (patch) | |
| tree | 52a963c53eebb959df5ce3ac965b65f704c07483 /tools/chrome_proxy/common | |
| parent | 90ad13a3b73ceda1500ab42de3d628ef851c2daa (diff) | |
| download | chromium_src-60c3db53394bdba955667eaecc312695f65c8766.zip chromium_src-60c3db53394bdba955667eaecc312695f65c8766.tar.gz chromium_src-60c3db53394bdba955667eaecc312695f65c8766.tar.bz2 | |
Kill page_test.NavigateToPage
BUG=455391, 470147
Review URL: https://codereview.chromium.org/1135173007
Cr-Commit-Position: refs/heads/master@{#330623}
Diffstat (limited to 'tools/chrome_proxy/common')
| -rw-r--r-- | tools/chrome_proxy/common/chrome_proxy_measurements.py | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/tools/chrome_proxy/common/chrome_proxy_measurements.py b/tools/chrome_proxy/common/chrome_proxy_measurements.py index ab8fd67..1e14d37 100644 --- a/tools/chrome_proxy/common/chrome_proxy_measurements.py +++ b/tools/chrome_proxy/common/chrome_proxy_measurements.py @@ -19,8 +19,6 @@ class ChromeProxyValidation(page_test.PageTest): needs_browser_restart_after_each_page=restart_after_each_page) self._metrics = metrics self._page = None - # Whether a timeout exception is expected during the test. - self._expect_timeout = False def CustomizeBrowserOptions(self, options): # Enable the chrome proxy (data reduction proxy). @@ -49,17 +47,3 @@ class ChromeProxyValidation(page_test.PageTest): if hasattr(page, 'restart_after') and page.restart_after: return True return False - - def RunNavigateSteps(self, page, tab): - # The redirect from safebrowsing causes a timeout. Ignore that. - try: - super(ChromeProxyValidation, self).RunNavigateSteps(page, tab) - if self._expect_timeout: - raise metrics.ChromeProxyMetricException, ( - 'Timeout was expected, but did not occur') - except exceptions.TimeoutException as e: - if self._expect_timeout: - logging.warning('Navigation timeout on page %s', - page.name if page.name else page.url) - else: - raise e |