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

Unified Diff: tools/telemetry/telemetry/page/page_test.py

Issue 22883011: Removing Page.WaitToLoad and update all pagesets to use explicit wait actions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Putting default navigate_steps inside page_set rather than page Created 7 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/telemetry/telemetry/page/page_set.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/telemetry/telemetry/page/page_test.py
diff --git a/tools/telemetry/telemetry/page/page_test.py b/tools/telemetry/telemetry/page/page_test.py
index e9d7147664b9fea315e8463b82b582fef4072b47..405a621c9332131c1a6582c0afb9ebdd0d0a8e91 100644
--- a/tools/telemetry/telemetry/page/page_test.py
+++ b/tools/telemetry/telemetry/page/page_test.py
@@ -205,22 +205,15 @@ class PageTest(object):
def RunNavigateSteps(self, page, tab):
"""Navigates the tab to the page URL attribute.
- If 'navigate_steps' is defined for the page, this will attempt to
- run it as a compound action.
+ Runs the 'navigate_steps' page attribute as a compound action.
"""
- if hasattr(page, 'navigate_steps'):
- navigate_actions = GetCompoundActionFromPage(page, 'navigate_steps')
- if not any(isinstance(action, navigate.NavigateAction)
- for action in navigate_actions):
- raise page_action.PageActionFailed(
- 'No NavigateAction in navigate_steps')
- self._RunCompoundAction(page, tab, navigate_actions, False)
- else:
- # TODO(edmundyan): Make a default navigate_steps action on the page object
- # once we can deprecate page.WaitToLoad()
- i = navigate.NavigateAction()
- i.RunAction(page, tab, None)
- page.WaitToLoad(tab, 60)
+ navigate_actions = GetCompoundActionFromPage(page, 'navigate_steps')
+ if not any(isinstance(action, navigate.NavigateAction)
+ for action in navigate_actions):
+ raise page_action.PageActionFailed(
+ 'No NavigateAction in navigate_steps')
+
+ self._RunCompoundAction(page, tab, navigate_actions, False)
@property
def action_name_to_run(self):
« no previous file with comments | « tools/telemetry/telemetry/page/page_set.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698