Firefox: Actually use launch_browser timeout

Until this commit, _wait_until_connectable waited for 30 seconds, no
matter the timeout value given in the Firefox WebDriver __init__().

Fixes #1300

Signed-off-by: Luke Inman-Semerau <luke.semerau@gmail.com>

py/selenium/webdriver/firefox/extension_connection.py

@@ -34,6 +34,8 @@ def __init__(self, host, firefox_profile, firefox_binary=None, timeout=30):
         self.profile = firefox_profile
         self.binary = firefox_binary
         HOST = host
+        timeout = int(timeout)
+
         if self.binary is None:
             self.binary = FirefoxBinary()
 
@@ -46,7 +48,7 @@ def __init__(self, host, firefox_profile, firefox_binary=None, timeout=30):
 
         self.profile.add_extension()
 
-        self.binary.launch_browser(self.profile)
+        self.binary.launch_browser(self.profile, timeout=timeout)
         _URL = "http://%s:%d/hub" % (HOST, PORT)
         RemoteConnection.__init__(
             self, _URL, keep_alive=True)

py/selenium/webdriver/firefox/firefox_binary.py

@@ -58,14 +58,14 @@ def __init__(self, firefox_path=None, log_file=None):
     def add_command_line_options(self, *args):
         self.command_line = args
 
-    def launch_browser(self, profile):
+    def launch_browser(self, profile, timeout=30):
         """Launches the browser for the given profile name.
         It is assumed the profile already exists.
         """
         self.profile = profile
 
         self._start_from_profile_path(self.profile.path)
-        self._wait_until_connectable()
+        self._wait_until_connectable(timeout=timeout)
 
     def kill(self):
         """Kill the browser.
@@ -89,7 +89,7 @@ def _start_from_profile_path(self, path):
             command, stdout=self._log_file, stderr=STDOUT,
             env=self._firefox_env)
 
-    def _wait_until_connectable(self):
+    def _wait_until_connectable(self, timeout=30):
         """Blocks until the extension is connectable in the firefox."""
         count = 0
         while not utils.is_connectable(self.profile.port):
@@ -98,7 +98,7 @@ def _wait_until_connectable(self):
                 raise WebDriverException("The browser appears to have exited "
                       "before we could connect. If you specified a log_file in "
                       "the FirefoxBinary constructor, check it for details.")
-            if count == 30:
+            if count >= timeout:
                 self.kill()
                 raise WebDriverException("Can't load the profile. Profile "
                       "Dir: %s If you specified a log_file in the "