Bug 1517442 - [marionette] Use current instead of default startup time in raise_for_port r=whimboo
authorAgboola Mukhtar <agboolaolamide9@gmail.com>
Wed, 16 Jan 2019 19:54:53 +0000
changeset 511247 d0e6b3cbbd16bce6ab704eb708464ab238d8ded3
parent 511246 9b2f212b3947b9511b0b6bc2b0256d5239a7d045
child 511248 8d7abfb509e974c6d5555c4fc1620904bd000182
push id10547
push userffxbld-merge
push dateMon, 21 Jan 2019 13:03:58 +0000
treeherdermozilla-beta@24ec1916bffe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerswhimboo
bugs1517442
milestone66.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1517442 - [marionette] Use current instead of default startup time in raise_for_port r=whimboo Differential Revision: https://phabricator.services.mozilla.com/D16609
testing/marionette/client/marionette_driver/marionette.py
--- a/testing/marionette/client/marionette_driver/marionette.py
+++ b/testing/marionette/client/marionette_driver/marionette.py
@@ -693,17 +693,17 @@ class Marionette(object):
         """Raise socket.timeout if no connection can be established.
 
         :param timeout: Optional timeout in seconds for the server to be ready.
         :param check_process_status: Optional, if `True` the process will be
             continuously checked if it has exited, and the connection
             attempt will be aborted.
         """
         if timeout is None:
-            timeout = self.DEFAULT_STARTUP_TIMEOUT
+            timeout = self.startup_timeout
 
         runner = None
         if self.instance is not None:
             runner = self.instance.runner
 
         poll_interval = 0.1
         starttime = datetime.datetime.now()
         timeout_time = starttime + datetime.timedelta(seconds=timeout)