Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-01 17:23:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1414063 - Increase mochitest/reftest default output timeout to 370 seconds; r=jmaher

Browse Source
This commit is contained in:
Geoff Brown 2017-11-03 12:08:29 -06:00
parent bb77a111ee
commit 8538ff6458
4 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
layout/tools/reftest/reftestcommandline.py
View File

@ -71,7 +71,7 @@ class ReftestArgumentsParser(argparse.ArgumentParser):
action="store",
dest="timeout",
type=int,
default=5 * 60, # 5 minutes per bug 479518
default=300, # 5 minutes per bug 479518
help="reftest will timeout in specified number of seconds. "
"[default %(default)s].")

13
layout/tools/reftest/runreftest.py
View File

@ -795,10 +795,17 @@ class RefTest(object):
status, startAfter = self.runApp(profile,
binary=options.app,
cmdargs=cmdargs,
# give the JS harness 30 seconds to deal with
# its own timeouts
env=browserEnv,
timeout=options.timeout + 30.0,
# We generally want the JS harness or marionette to handle
# timeouts if they can.
# The default JS harness timeout is currently 300 seconds
# (default value of options.timeout).
# The default Marionette socket timeout is currently 360 seconds.
# Give the JS harness extra time to deal with its own timeouts
# and try to usually exceed the 360 second marionette socket
# timeout.
# See bug 479518 and bug 1414063.
timeout=options.timeout + 70.0,
symbolsPath=options.symbolsPath,
options=options,
debuggerInfo=debuggerInfo)

8
testing/mochitest/runtests.py
View File

@ -2652,7 +2652,13 @@ toolbar#nav-bar {
elif options.debugger or not options.autorun:
timeout = None
else:
timeout = 330.0 # default JS harness timeout is 300 seconds
# We generally want the JS harness or marionette to handle
# timeouts if they can.
# The default JS harness timeout is currently 300 seconds.
# The default Marionette socket timeout is currently 360 seconds.
# Wait a little (10 seconds) more before timing out here.
# See bug 479518 and bug 1414063.
timeout = 370.0
# Detect shutdown leaks for m-bc runs if
# code coverage is not enabled.

2
testing/mochitest/tests/SimpleTest/TestRunner.js
View File

@ -88,7 +88,7 @@ TestRunner._lastAssertionCount = 0;
TestRunner._expectedMinAsserts = 0;
TestRunner._expectedMaxAsserts = 0;
TestRunner.timeout = 5 * 60 * 1000; // 5 minutes.
TestRunner.timeout = 300 * 1000; // 5 minutes.
TestRunner.maxTimeouts = 4; // halt testing after too many timeouts
TestRunner.runSlower = false;
TestRunner.dumpOutputDirectory = "";