Bug 1274002 - Disable e10s when running mochitest-chrome locally with mach, r?jmaher draft
authorAndrew Halberstadt <ahalberstadt@mozilla.com>
Wed, 18 May 2016 15:17:13 -0400
changeset 368461 4a2efd905a717c96e750eba360efb79410ab499d
parent 367997 f3f2fa1d7eed5a8262f6401ef18ff8117a3ce43e
child 521280 6cc45f040175ee17796c62483306456bca0fb47a
push id18542
push userahalberstadt@mozilla.com
push dateWed, 18 May 2016 19:26:30 +0000
reviewersjmaher
bugs1274002
milestone49.0a1
Bug 1274002 - Disable e10s when running mochitest-chrome locally with mach, r?jmaher MozReview-Commit-ID: 1r2aZtnB3lo
testing/mochitest/mochitest_options.py
testing/mochitest/runtests.py
--- a/testing/mochitest/mochitest_options.py
+++ b/testing/mochitest/mochitest_options.py
@@ -784,22 +784,16 @@ class MochitestArguments(ArgumentContain
                 if not os.path.isfile(f):
                     parser.error(
                         'Missing binary %s required for '
                         '--use-test-media-devices' % f)
 
         if options.nested_oop:
             options.e10s = True
 
-        # a11y and chrome tests don't run with e10s enabled in CI
-        if options.a11y or options.chrome:
-            options.e10s = False
-
-        mozinfo.update({"e10s": options.e10s})  # for test manifest parsing.
-
         options.leakThresholds = {
             "default": options.defaultLeakThreshold,
             "tab": 10000,  # See dependencies of bug 1051230.
             # GMP rarely gets a log, but when it does, it leaks a little.
             "geckomediaplugin": 20000,
         }
 
         # XXX We can't normalize test_paths in the non build_obj case here,
--- a/testing/mochitest/runtests.py
+++ b/testing/mochitest/runtests.py
@@ -2185,16 +2185,22 @@ class MochitestDesktop(MochitestBase):
         if options.bisectChunk and options.bisectChunk in self.result:
             bisect.print_summary()
 
         return result
 
     def runTests(self, options):
         """ Prepare, configure, run tests and cleanup """
 
+        # a11y and chrome tests don't run with e10s enabled in CI. Need to set
+        # this here since |mach mochitest| sets the flavor after argument parsing.
+        if options.a11y or options.chrome:
+            options.e10s = False
+        mozinfo.update({"e10s": options.e10s})  # for test manifest parsing.
+
         self.setTestRoot(options)
 
         # Despite our efforts to clean up servers started by this script, in practice
         # we still see infrequent cases where a process is orphaned and interferes
         # with future tests, typically because the old server is keeping the port in use.
         # Try to avoid those failures by checking for and killing orphan servers before
         # trying to start new ones.
         self.killNamedOrphans('ssltunnel')