Bug 1394377 - Increase default shutdown timeout to 120s.
The background thread hang monitor will crash Firefox after 60s if
a shutdown is too slow. Debug builds are slower and as such Marionette
would force kill Firefox right before the hang monitor can kick in.
MozReview-Commit-ID: GGQFPEZ37dg
--- a/testing/marionette/client/marionette_driver/marionette.py
+++ b/testing/marionette/client/marionette_driver/marionette.py
@@ -549,17 +549,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.
DEFAULT_STARTUP_TIMEOUT = 120
- DEFAULT_SHUTDOWN_TIMEOUT = 65 # Firefox will kill hanging threads after 60s
+ DEFAULT_SHUTDOWN_TIMEOUT = 120 # Firefox will kill hanging threads after 60s
# Bug 1336953 - Until we can remove the socket timeout parameter it has to be
# set a default value which is larger than the longest timeout as defined by the
# WebDriver spec. In that case its 300s for page load. Also add another minute
# so that slow builds have enough time to send the timeout error to the client.
DEFAULT_SOCKET_TIMEOUT = 360
def __init__(self, host="localhost", port=2828, app=None, bin=None,