Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 21:05:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1119211 - Disable the 360 second socket timeout when marionette is invoked with --jsdebugger.;r=ato

Browse Source
This commit is contained in:
Chris Manchester 2015-02-19 17:41:37 -08:00
parent 4fa2ac100d
commit 644c6791c0
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
testing/marionette/client/marionette/runner/base.py
View File

@ -242,6 +242,8 @@ class MarionetteTextTestRunner(StructuredTestRunner):
class BaseMarionetteOptions(OptionParser):
socket_timeout_default = 360.0
def __init__(self, **kwargs):
OptionParser.__init__(self, **kwargs)
self.parse_args_handlers = [] # Used by mixins
@ -401,6 +403,11 @@ class BaseMarionetteOptions(OptionParser):
action='store_true',
default=False,
help='Enable the jsdebugger for marionette javascript.')
self.add_option('--socket-timeout',
dest='socket_timeout',
action='store',
default=self.socket_timeout_default,
help='Set the global timeout for marionette socket operations.')
self.add_option('--e10s',
dest='e10s',
action='store_true',
@ -457,6 +464,7 @@ class BaseMarionetteOptions(OptionParser):
if options.jsdebugger:
options.app_args.append('-jsdebugger')
options.socket_timeout = None
if options.e10s:
options.prefs = {
@ -482,7 +490,9 @@ class BaseMarionetteTestRunner(object):
shuffle=False, shuffle_seed=random.randint(0, sys.maxint),
sdcard=None, this_chunk=1, total_chunks=1, sources=None,
server_root=None, gecko_log=None, result_callbacks=None,
adb_host=None, adb_port=None, prefs=None, **kwargs):
adb_host=None, adb_port=None, prefs=None,
socket_timeout=BaseMarionetteOptions.socket_timeout_default,
**kwargs):
self.address = address
self.emulator = emulator
self.emulator_binary = emulator_binary
@ -507,6 +517,7 @@ class BaseMarionetteTestRunner(object):
self.device_serial = device_serial
self.symbols_path = symbols_path
self.timeout = timeout
self.socket_timeout = socket_timeout
self._device = None
self._capabilities = None
self._appName = None
@ -638,6 +649,7 @@ class BaseMarionetteTestRunner(object):
'device_serial': self.device_serial,
'symbols_path': self.symbols_path,
'timeout': self.timeout,
'socket_timeout': self.socket_timeout,
'adb_host': self._adb_host,
'adb_port': self._adb_port,
'prefs': self.prefs,