Add Wait* API to ActionRunner to wrap over WaitAction.

tools/telemetry/telemetry/page/actions/action_runner.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+from telemetry.page.actions import page_action
 from telemetry.page.actions.javascript import JavaScriptAction
 from telemetry.page.actions.navigate import NavigateAction
+from telemetry.page.actions.wait import WaitAction
 from telemetry.web_perf import timeline_interaction_record as tir_module
 
 
 class ActionRunner(object):
+
   def __init__(self, tab):
     self._tab = tab
 
   # TODO(nednguyen): remove this (or make private) when
   # crbug.com/361809 is marked fixed
   def RunAction(self, action):
     if not action.WillWaitAfterRun():
       action.WillRunAction(self._tab)
     action.RunActionAndMaybeWait(self._tab)
 
@@ skipping 43 matching lines @@
   def ExecuteJavaScript(self, js_expression):
     """Executes a given JavaScript expression.
 
     Example: runner.ExecuteJavaScript('var foo = 1;');
 
     Args:
       js_expression: The expression to execute (provided as string).
     """
     self.RunAction(JavaScriptAction({'expression': js_expression}))
 
+  def Wait(self, seconds):
+    """Wait for the number of seconds specified.
+
+    Args:
+      seconds: The number of seconds to wait.
+    """
+    self.RunAction(WaitAction({'seconds': seconds}))
+
+  def WaitForJavaScriptCondition(self, condition, timeout=60):
+    """Wait for a JavaScript condition to become true.
+
+    Example: runner.WaitForJavaScriptCondition('window.foo == 10');
+
+    Args:
+      condition: The JavaScript condition (as string).
+      timeout: The timeout in seconds (default to 60).
+    """
+    self.RunAction(WaitAction({'javascript': condition, 'timeout': timeout}))
+
+  def WaitForElement(self, selector=None, contains_text=None,
+                     element_function=None, timeout=60):
+    """Wait for an element to appear in the document.
+
+    Args:
+      selector: A CSS selector describing the element.
+      contains_text: A text that should be appear on the page.
+          DO NOT SUBMIT: Should this be split out to WaitForText?
+      element_function: A JavaScript function (as string) that is used
+          to retrieve the element. For example:
+          'function() { return foo.element; }'.
+      timeout: The timeout in seconds (default to 60).
+    """
+    attr = {'condition': 'element', 'timeout': timeout}
+    _FillElementSelector(
+        attr, selector, contains_text, element_function)
+    self.RunAction(WaitAction(attr))
+
+
+def _FillElementSelector(attr, selector=None, contains_text=None,

[nednguyen, 2014/06/06 21:37:51]

contains_text -> text & update documentation to make it clear that this is exact
text.

[chrishenry, 2014/06/06 22:50:47]

Done.

+                         element_function=None):
+  count = 0
+  if selector is not None:
+    count = count + 1
+    attr['selector'] = selector
+  if contains_text is not None:
+    count = count + 1
+    attr['text'] = contains_text
+  if element_function is not None:
+    count = count + 1
+    attr['element_function'] = element_function
+
+  if count != 1:
+    raise page_action.PageActionFailed(
+        'Must specify 1 way to retrieve function, but %s was specified: %s' %
+        (len(attr), attr.keys()))
+
 
 class Interaction(object):
   def __init__(self, action_runner, label, flags):
     assert action_runner
     assert label
     assert isinstance(flags, list)
 
     self._action_runner = action_runner
     self._label = label
     self._flags = flags
     self._started = False
 
   def Begin(self):
     assert not self._started
     self._started = True
     self._action_runner.ExecuteJavaScript('console.time("%s");' %
         tir_module.TimelineInteractionRecord.GetJavaScriptMarker(
             self._label, self._flags))
 
   def End(self):
     assert self._started
     self._started = False
     self._action_runner.ExecuteJavaScript('console.timeEnd("%s");' %
         tir_module.TimelineInteractionRecord.GetJavaScriptMarker(
             self._label, self._flags))