commit 0309dc99e4f2ffae6211c80e4e46a62579807486
author Achuith Bhandarkar <achuith@chromium.org> Thu Feb 02 16:05:18 2017 -0800
committer chrome-bot <chrome-bot@chromium.org> Fri Feb 03 20:01:50 2017 -0800
tree edd1f6bf068ebac7baa225452d8bf59ae10026f0
parent 589ab679540ce0f81cb1de2cb53d4fe382c6aa90

autotest: Replace WaitForJavaScriptExpression with WaitForJavaScriptCondition.

BUG=chromium:682812
TEST=trybot

Change-Id: I8a71fe24c04f31d401a1925251c5d221accb4d46
Reviewed-on: https://chromium-review.googlesource.com/436528
Commit-Ready: Achuith Bhandarkar <achuith@chromium.org>
Tested-by: Achuith Bhandarkar <achuith@chromium.org>
Reviewed-by: Jacob Dufault <jdufault@chromium.org>

client/common_lib/cros/arc_util.py

diff --git a/client/common_lib/cros/arc_util.py b/client/common_lib/cros/arc_util.py
index a948817..3c8fb76 100644
--- a/client/common_lib/cros/arc_util.py
+++ b/client/common_lib/cros/arc_util.py
@@ -212,8 +212,8 @@
             '(termsPage.isManaged_ || termsPage.state_ == LoadState.LOADED)']
     try:
         for condition in js_code_did_start_conditions:
-            extension_main_page.WaitForJavaScriptExpression(condition,
-                                                            timeout=60)
+            extension_main_page.WaitForJavaScriptCondition(condition,
+                                                           timeout=60)
     except Exception, e:
         raise error.TestError('Error waiting for "%s": "%s".' % (condition, e))
 
@@ -238,8 +238,8 @@
 
     SIGN_IN_TIMEOUT = 120
     try:
-        extension_main_page.WaitForJavaScriptExpression('!appWindow',
-                                                        timeout=SIGN_IN_TIMEOUT)
+        extension_main_page.WaitForJavaScriptCondition('!appWindow',
+                                                       timeout=SIGN_IN_TIMEOUT)
     except Exception, e:
         js_read_error_message = """
             err = appWindow.contentWindow.document.getElementById(

client/common_lib/cros/cfm_util.py

diff --git a/client/common_lib/cros/cfm_util.py b/client/common_lib/cros/cfm_util.py
index 21c1355..7b2ed83 100644
--- a/client/common_lib/cros/cfm_util.py
+++ b/client/common_lib/cros/cfm_util.py
@@ -68,7 +68,7 @@
 
     @param webview_context: Context for hangouts webview.
     """
-    webview_context.WaitForJavaScriptExpression(
+    webview_context.WaitForJavaScriptCondition(
             "typeof window.hrOobIsStartPageForTest == 'function'",
             timeout=DEFAULT_TIMEOUT)
     logging.info('Hotrod telemetry commands available for testing.')
@@ -80,7 +80,7 @@
 
     @param webview_context: Context for hangouts webview.
     """
-    webview_context.WaitForJavaScriptExpression(
+    webview_context.WaitForJavaScriptCondition(
             "window.hrOobIsStartPageForTest() === true;",
             timeout=DEFAULT_TIMEOUT)
     logging.info('Reached oobe start page')

client/common_lib/cros/enrollment.py

diff --git a/client/common_lib/cros/enrollment.py b/client/common_lib/cros/enrollment.py
index 5f38cf1..9973099 100644
--- a/client/common_lib/cros/enrollment.py
+++ b/client/common_lib/cros/enrollment.py
@@ -11,8 +11,8 @@
 def _ExecuteOobeCmd(browser, cmd):
     logging.info('Invoking ' + cmd)
     oobe = browser.oobe
-    oobe.WaitForJavaScriptExpression('typeof Oobe !== \'undefined\'',
-                                     timeout=10)
+    oobe.WaitForJavaScriptCondition('typeof Oobe !== \'undefined\'',
+                                    timeout=10)
     oobe.ExecuteJavaScript(cmd)
 
 

client/common_lib/cros/kiosk_utils.py

diff --git a/client/common_lib/cros/kiosk_utils.py b/client/common_lib/cros/kiosk_utils.py
index 22b09ce..4ac8481 100644
--- a/client/common_lib/cros/kiosk_utils.py
+++ b/client/common_lib/cros/kiosk_utils.py
@@ -46,7 +46,7 @@
             """ % app_config_id
     #Verify that Risepplayer successfully validates the display id.
     try:
-        kiosk_webview_context.WaitForJavaScriptExpression(
+        kiosk_webview_context.WaitForJavaScriptCondition(
                 verify_app_config_id,
                 timeout=DEFAULT_TIMEOUT)
     except exceptions.TimeoutException: