Bug 1275296 - Increase Marionette DEFAULT_STARTUP_TIMEOUT. r=automatedtester
MozReview-Commit-ID: 9UcDCQb2yvN
--- a/testing/marionette/client/marionette_driver/marionette.py
+++ b/testing/marionette/client/marionette_driver/marionette.py
@@ -529,17 +529,17 @@ 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_STARTUP_TIMEOUT = 60
+ DEFAULT_STARTUP_TIMEOUT = 120
def __init__(self, host='localhost', port=2828, app=None, app_args=None, bin=None,
profile=None, addons=None, emulator=None, sdcard=None, emulator_img=None,
emulator_binary=None, emulator_res=None, connect_to_running_emulator=False,
gecko_log=None, homedir=None, baseurl=None, no_window=False, logdir=None,
busybox=None, symbols_path=None, timeout=None,
socket_timeout=DEFAULT_SOCKET_TIMEOUT, device_serial=None, adb_path=None,
process_args=None, adb_host=None, adb_port=None, prefs=None,