Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(342)

Side by Side Diff: tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/safebrowsing.py

Issue 1135173007: Kill page_test.NavigateToPage (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@KillNavigateToPage
Patch Set: Address sclittle's comment Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 import logging
4 5
6 from telemetry.core import exceptions
5 from telemetry.page import page as page_module 7 from telemetry.page import page as page_module
6 from telemetry.page import page_set as page_set_module 8 from telemetry.page import page_set as page_set_module
7 9
8 10
9 class SafebrowsingPage(page_module.Page): 11 class SafebrowsingPage(page_module.Page):
10 12
11 """ 13 """
12 Why: Expect 'malware ahead' page. Use a short navigation timeout because no 14 Why: Expect 'malware ahead' page. Use a short navigation timeout because no
13 response will be received. 15 response will be received.
14 """ 16 """
15 17
16 def __init__(self, url, page_set): 18 def __init__(self, url, page_set, expect_timeout):
17 super(SafebrowsingPage, self).__init__(url=url, page_set=page_set) 19 super(SafebrowsingPage, self).__init__(url=url, page_set=page_set)
18 self.archive_data_file = '../data/chrome_proxy_safebrowsing.json' 20 self.archive_data_file = '../data/chrome_proxy_safebrowsing.json'
21 self._expect_timeout = expect_timeout
19 22
20 def RunNavigateSteps(self, action_runner): 23 def RunNavigateSteps(self, action_runner):
21 action_runner.Navigate(self.url, timeout_in_seconds=5) 24 try:
25 action_runner.Navigate(self.url, timeout_in_seconds=5)
26 except exceptions.TimeoutException as e:
27 if self._expect_timeout:
28 logging.warning('Navigation timeout on page %s', self.url)
29 else:
30 raise e
22 31
23 32
24 class SafebrowsingPageSet(page_set_module.PageSet): 33 class SafebrowsingPageSet(page_set_module.PageSet):
25 34
26 """ Chrome proxy test sites """ 35 """ Chrome proxy test sites """
27 36
28 def __init__(self): 37 def __init__(self, expect_timeout=False):
29 super(SafebrowsingPageSet, self).__init__( 38 super(SafebrowsingPageSet, self).__init__(
30 archive_data_file='../data/chrome_proxy_safebrowsing.json') 39 archive_data_file='../data/chrome_proxy_safebrowsing.json')
31 40
32 self.AddUserStory(SafebrowsingPage('http://www.ianfette.org/', self)) 41 self.AddUserStory(
42 SafebrowsingPage('http://www.ianfette.org/', self, expect_timeout))
OLDNEW
« no previous file with comments | « tools/chrome_proxy/integration_tests/chrome_proxy_measurements.py ('k') | tools/telemetry/telemetry/page/page_test.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698