Chromium Code Reviews| 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..72a29db714b0371a9dbe1c2dd3cf09c6157070e6 100644 |
| --- a/tools/telemetry/telemetry/page/page_test.py |
| +++ b/tools/telemetry/telemetry/page/page_test.py |
| @@ -209,18 +209,13 @@ class PageTest(object): |
| run it as a compound action. |
| """ |
| if hasattr(page, 'navigate_steps'): |
| - navigate_actions = GetCompoundActionFromPage(page, 'navigate_steps') |
| + page.navigate_actions = GetCompoundActionFromPage(page, 'navigate_steps') |
|
dtu
2013/08/20 23:57:39
Why assign it to page if you're not using it anywh
edmundyan
2013/08/21 21:44:31
I think your previous comment had said to make it
dtu
2013/08/21 23:09:18
Okay, either way. I think my original idea was to
edmundyan
2013/08/22 23:05:08
Oh heh. Done that way. I like defining the default
|
| if not any(isinstance(action, navigate.NavigateAction) |
| - for action in navigate_actions): |
| + for action in page.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) |
| + |
| + self._RunCompoundAction(page, tab, page.navigate_actions, False) |
| @property |
| def action_name_to_run(self): |