Bug 1329034 - Increase default timeout on debug browser mochitests; r=jmaher
authorGeoff Brown <gbrown@mozilla.com>
Wed, 18 Jan 2017 07:56:49 -0700
changeset 463183 20d71b8cba1558f8b55a3c07e8b4d5ea91b9288b
parent 463182 eb6cd64d4a67b8342673a19412588ee834e77f5f
child 463184 f9390a0f43a79d6cd0456d50277e926ca8c38380
child 463240 34ffa05e2af018ce65d69c49f9018cf2aa99438b
child 463326 81a7cdc831cb752cc43e9de594f7f399c57104fa
child 463677 f400bfe7222bb0d4fc84a9671bc677ec0e4e686a
push id41967
push userbmo:miket@mozilla.com
push dateWed, 18 Jan 2017 15:17:32 +0000
reviewersjmaher
bugs1329034
milestone53.0a1
Bug 1329034 - Increase default timeout on debug browser mochitests; r=jmaher
testing/mochitest/runtests.py
--- a/testing/mochitest/runtests.py
+++ b/testing/mochitest/runtests.py
@@ -1629,19 +1629,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(