Bug 1301661 - Completely remove default value of 360s for socket_timeout r=maja_zf
authorHenrik Skupin <mail@hskupin.info>
Mon, 12 Sep 2016 13:03:06 +0200
changeset 313509 76d5fdf2aa3d24f254e48820938c1727440a1ae9
parent 313508 c1a0f3b91b283afbb8d73fd692af7f591c4f1d81
child 313510 9679b6eb4beeb595899447cea1c4e513cb91993a
push id30689
push userkwierso@gmail.com
push dateMon, 12 Sep 2016 23:52:16 +0000
treeherdermozilla-central@7b1cb8b0be7c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmaja_zf
bugs1301661
milestone51.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 1301661 - Completely remove default value of 360s for socket_timeout r=maja_zf MozReview-Commit-ID: 2xaWEAgSsTC
testing/marionette/client/marionette_driver/transport.py
testing/marionette/harness/marionette/runner/base.py
testing/marionette/harness/marionette/tests/harness_unit/conftest.py
--- a/testing/marionette/client/marionette_driver/transport.py
+++ b/testing/marionette/client/marionette_driver/transport.py
@@ -114,17 +114,17 @@ class TcpTransport(object):
         7:MESSAGE
 
     On top of this protocol it uses a Marionette message format, that
     depending on the protocol level offered by the remote server, varies.
     Supported protocol levels are 1 and above.
     """
     max_packet_length = 4096
 
-    def __init__(self, addr, port, socket_timeout=360.0):
+    def __init__(self, addr, port, socket_timeout=60.0):
         """If `socket_timeout` is `0` or `0.0`, non-blocking socket mode
         will be used.  Setting it to `1` or `None` disables timeouts on
         socket operations altogether.
         """
         self.addr = addr
         self.port = port
         self.socket_timeout = socket_timeout
 
--- a/testing/marionette/harness/marionette/runner/base.py
+++ b/testing/marionette/harness/marionette/runner/base.py
@@ -238,17 +238,17 @@ class MarionetteTextTestRunner(Structure
 
     def run(self, test):
         result = super(MarionetteTextTestRunner, self).run(test)
         result.printLogs(test)
         return result
 
 
 class BaseMarionetteArguments(ArgumentParser):
-    socket_timeout_default = 360.0
+    socket_timeout_default = 60.0
 
     def __init__(self, **kwargs):
         ArgumentParser.__init__(self, **kwargs)
 
         def dir_path(path):
             path = os.path.abspath(os.path.expanduser(path))
             if not os.access(path, os.F_OK):
                 os.makedirs(path)
--- a/testing/marionette/harness/marionette/tests/harness_unit/conftest.py
+++ b/testing/marionette/harness/marionette/tests/harness_unit/conftest.py
@@ -63,17 +63,17 @@ def mach_parsed_kwargs(logger):
         'prefs_args': None,
         'prefs_files': None,
         'profile': None,
         'pydebugger': None,
         'repeat': 0,
         'server_root': None,
         'shuffle': False,
         'shuffle_seed': 2276870381009474531,
-        'socket_timeout': 360.0,
+        'socket_timeout': 60.0,
         'sources': None,
         'startup_timeout': 60,
         'symbols_path': None,
         'test_tags': None,
         'tests': [u'/path/to/unit-tests.ini'],
         'testvars': None,
         'this_chunk': None,
         'timeout': None,