Add timeouts to LoadPage and ExecJavascipt.

tools/chrome_proxy/webdriver/common.py

 # Copyright 2016 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.
 
 import argparse
 import json
 import os
 import re
+import socket
 import shlex
 import sys
 import time
 import traceback
 
 sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir, os.pardir,
   os.pardir, 'third_party', 'webdriver', 'pylib'))
 from selenium import webdriver
 from selenium.webdriver.chrome.options import Options
 
@@ skipping 178 matching lines @@
       'clearHostResolverCache();}')
 
   def SetURL(self, url):
     """Sets the URL that the browser will navigate to during the test.
 
     Args:
       url: The string URL to navigate to
     """
     self._url = url
 
-  # TODO(robertogden): Add timeout.
-  def LoadPage(self):
+  def LoadPage(self, timeout=30):
     """Starts Chromium with any arguments previously given and navigates to the
     given URL.
+
+    Args:
+      timeout: Page load timeout in seconds.
     """
     if not self._driver:
       self._StartDriver()
+    self._driver.set_page_load_timeout(timeout)
     self._driver.get(self._url)
 
-  # TODO(robertogden): Add timeout.
-  def ExecuteJavascript(self, script):
-    """Executes the given javascript in the browser's current page as if it were
-    on the console.
+  def ExecuteJavascript(self, script, timeout=30):
+    """Executes the given javascript in the browser's current page in an
+    anonymous function.
+
+    If you expect a result and don't get one, try adding a return statement or
+    using ExecuteJavascriptStatement() below.
 
     Args:
       script: A string of Javascript code.
+      timeout: Timeout for the Javascript code to return in seconds.
     Returns:
       A string of the verbatim output from the Javascript execution.
     """
     if not self._driver:
       self._StartDriver()
-    return self._driver.execute_script("return " + script)
+    # TODO(crbug/672114): Use 'driver.set_script_timeout(timeout)' instead.

[sclittle, 2016/12/07 18:08:56]

nit: put a username in the TODO(), and mention the crbug elsewhere in the
comment.

[Robert Ogden, 2016/12/07 18:48:22]

Done.

+    default_timeout = socket.getdefaulttimeout()
+    socket.setdefaulttimeout(timeout)
+    script_result = self._driver.execute_script(script)
+    socket.setdefaulttimeout(default_timeout)
+    return script_result
+
+  def ExecuteJavascriptStatement(self, script, timeout=30):
+    """Wraps ExecuteJavascript() for use with a single statement.
+
+    Behavior is analogous to 'function(){ return <script> }();'
+
+    Args:
+      script: A string of Javascript code.
+      timeout: Timeout for the Javascript code to return in seconds.
+    Returns:
+      A string of the verbatim output from the Javascript execution.
+    """
+    return self.ExecuteJavascript("return " + script, timeout)
 
   def GetPerformanceLogs(self, method_filter=r'Network\.responseReceived'):
     """Returns all logged Performance events from Chrome.
 
     Args:
       method_filter: A regex expression to match the method of logged events
         against. Only logs who's method matches the regex will be returned.
     Returns:
       Performance logs as a list of dicts, since the last time this function was
       called.
@@ skipping 129 matching lines @@
     """
     sys.stderr.write("**************************************\n")
     sys.stderr.write("**************************************\n")
     sys.stderr.write("**                                  **\n")
     sys.stderr.write("**          TEST FAILURE            **\n")
     sys.stderr.write("**                                  **\n")
     sys.stderr.write("**************************************\n")
     sys.stderr.write("**************************************\n")
     sys.stderr.write(msg, '\n')
     sys.exit(1)