Bug 1329034 - Increase default timeout on debug browser mochitests. r=jmaher, a=test-only
authorGeoff Brown <gbrown@mozilla.com>
Wed, 18 Jan 2017 07:56:49 -0700
changeset 368961 9711dc9b0835a405b5f0fc19fe810a1d43a17072
parent 368960 0e959835dca1ff2135a42bc05399c1f0e220b1de
child 368962 f713672eb6e8c8eae16fb5fa91e3d6d6ba4c276d
push id1369
push userjlorenzo@mozilla.com
push dateMon, 27 Feb 2017 14:59:41 +0000
treeherdermozilla-release@d75a1dba431f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmaher, test-only
bugs1329034
milestone52.0
Bug 1329034 - Increase default timeout on debug browser mochitests. r=jmaher, a=test-only
testing/mochitest/runtests.py
--- a/testing/mochitest/runtests.py
+++ b/testing/mochitest/runtests.py
@@ -1630,19 +1630,21 @@ toolbar#nav-bar {
 
     def buildProfile(self, options):
         """ create the profile and add optional chrome bits and files if requested """
         if options.flavor == 'browser' and options.timeout:
             options.extraPrefs.append(
                 "testing.browserTestHarness.timeout=%d" %
                 options.timeout)
         # browser-chrome tests use a fairly short default timeout of 45 seconds;
-        # this is sometimes too short on asan, where we expect reduced performance.
-        if mozinfo.info["asan"] and options.flavor == 'browser' and options.timeout is None:
-            self.log.info("Increasing default timeout to 90 seconds on ASAN")
+        # this is sometimes too short on asan and debug, where we expect reduced
+        # performance.
+        if (mozinfo.info["asan"] or mozinfo.info["debug"]) and \
+                options.flavor == 'browser' and options.timeout is None:
+            self.log.info("Increasing default timeout to 90 seconds")
             options.extraPrefs.append("testing.browserTestHarness.timeout=90")
 
         options.extraPrefs.append(
             "browser.tabs.remote.autostart=%s" %
             ('true' if options.e10s else 'false'))
         if options.strictContentSandbox:
             options.extraPrefs.append("security.sandbox.content.level=1")
         options.extraPrefs.append(