Bug 1284457 - Reduce default socket timeout for Marionette to 60s r=ato a=testonly
authorHenrik Skupin <mail@hskupin.info>
Mon, 15 Aug 2016 16:55:02 +0200
changeset 347977 c6d4012b25e6984a7d6d588bc9dc0d8198f112c2
parent 347976 ee62b64c48474df97712e1988528e8ec1606814a
child 347978 7278fe6aa69fc1025ed799c3ffb427e01a89b665
push id6389
push userraliiev@mozilla.com
push dateMon, 19 Sep 2016 13:38:22 +0000
treeherdermozilla-beta@01d67bfe6c81 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersato, testonly
bugs1284457
milestone50.0a2
Bug 1284457 - Reduce default socket timeout for Marionette to 60s r=ato a=testonly MozReview-Commit-ID: DXASYzQD4sA
testing/marionette/client/marionette_driver/marionette.py
--- a/testing/marionette/client/marionette_driver/marionette.py
+++ b/testing/marionette/client/marionette_driver/marionette.py
@@ -536,17 +536,17 @@ class Alert(object):
 class Marionette(object):
     """Represents a Marionette connection to a browser or device."""
 
     CONTEXT_CHROME = 'chrome'  # non-browser content: windows, dialogs, etc.
     CONTEXT_CONTENT = 'content'  # browser content: iframes, divs, etc.
     TIMEOUT_SEARCH = 'implicit'
     TIMEOUT_SCRIPT = 'script'
     TIMEOUT_PAGE = 'page load'
-    DEFAULT_SOCKET_TIMEOUT = 360
+    DEFAULT_SOCKET_TIMEOUT = 60
     DEFAULT_STARTUP_TIMEOUT = 120
     DEFAULT_SHUTDOWN_TIMEOUT = 65  # Firefox will kill hanging threads after 60s
 
     def __init__(self, host='localhost', port=2828, app=None, bin=None,
                  baseurl=None, timeout=None, socket_timeout=DEFAULT_SOCKET_TIMEOUT,
                  startup_timeout=None, **instance_args):
         """
         :param host: address for Marionette connection