Merge lp:~roadmr/selenium-simple-test/add-timeout-to-firefoxbinary into lp:selenium-simple-test

[Daniel Manrique]

Add the timeout parameter to FirefoxBinary.

Newer versions of Selenium pass this parameter so SST's override of FirefoxBinary now breaks without it.

Add the timeout parameter to FirefoxBinary.

Newer versions of Selenium pass this parameter so SST's override of FirefoxBinary now breaks without it.

[lp:~roadmr/selenium-simple-test/add-timeout-to-firefoxbinary]

441. By Daniel Manrique on 2016-04-11

Add the timeout parameter to FirefoxBinary.

Newer versions of Selenium pass this parameter so SST's override of FirefoxBinary now breaks without it.

[Matt Goodall (matt-goodall)]

lgtm, but with the most pedantic and optional comment of my Canonical career to date :)

review: Approve

Unmerged revisions

441. By Daniel Manrique on 2016-04-11

Add the timeout parameter to FirefoxBinary.

Newer versions of Selenium pass this parameter so SST's override of FirefoxBinary now breaks without it.

=== modified file 'src/sst/browsers.py'
--- src/sst/browsers.py	2015-04-14 22:23:38 +0000
+++ src/sst/browsers.py	2016-04-11 15:27:58 +0000
@@ -143,7 +143,7 @@
         # available in a FirefoxBinary class
         return self.process.communicate()[0]
 
-    def _wait_until_connectable(self):
+    def _wait_until_connectable(self, timeout=30):
         """Blocks until the extension is connectable in the firefox.
 
         The base class implements this by checking utils.is_connectable() every
@@ -154,8 +154,8 @@
         firefox).
         """
         connectable = False
-        max_tries = 6
         sleep_for = 1
+        max_tries = int(timeout / sleep_for)
         for count in range(1, max_tries):
             connectable = utils.is_connectable(self.profile.port)
             if connectable: