Bug 1250744 - Disable e10s add-ons blocking on testing profiles. r=jmaher
authorFelipe Gomes <felipc@gmail.com>
Wed, 02 Mar 2016 13:50:55 -0300
changeset 324718 6606ab35633b2d93bf7fce53b64f7b9ae3c87573
parent 324717 8f1b196cd97344aca962d35e58fb62b57dc2b80f
child 324719 09bb9469a14d4587e44027e648438a5f23526cd7
push id1128
push userjlund@mozilla.com
push dateWed, 01 Jun 2016 01:31:59 +0000
treeherdermozilla-release@fe0d30de989d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmaher
bugs1250744
milestone47.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1250744 - Disable e10s add-ons blocking on testing profiles. r=jmaher
layout/tools/reftest/runreftest.py
testing/marionette/harness/marionette/runner/base.py
testing/mozharness/configs/unittests/linux_unittest.py
testing/mozharness/configs/unittests/mac_unittest.py
testing/mozharness/configs/unittests/win_unittest.py
testing/profiles/prefs_general.js
testing/talos/talos/config.py
--- a/layout/tools/reftest/runreftest.py
+++ b/layout/tools/reftest/runreftest.py
@@ -298,16 +298,17 @@ class RefTest(object):
         # Allow unsigned add-ons
         prefs['xpinstall.signatures.required'] = False
 
         # Don't use auto-enabled e10s
         prefs['browser.tabs.remote.autostart.1'] = False
         prefs['browser.tabs.remote.autostart.2'] = False
         if options.e10s:
             prefs['browser.tabs.remote.autostart'] = True
+            prefs['extensions.e10sBlocksEnabling'] = False
 
         for v in options.extraPrefs:
             thispref = v.split('=')
             if len(thispref) < 2:
                 print "Error: syntax error in --setpref=" + v
                 sys.exit(1)
             prefs[thispref[0]] = mozprofile.Preferences.cast(
                 thispref[1].strip())
--- a/testing/marionette/harness/marionette/runner/base.py
+++ b/testing/marionette/harness/marionette/runner/base.py
@@ -492,17 +492,18 @@ class BaseMarionetteArguments(ArgumentPa
         if args.jsdebugger:
             args.app_args.append('-jsdebugger')
             args.socket_timeout = None
 
         args.prefs = self._get_preferences(args.prefs_files, args.prefs_args)
 
         if args.e10s:
             args.prefs.update({
-                'browser.tabs.remote.autostart': True
+                'browser.tabs.remote.autostart': True,
+                'extensions.e10sBlocksEnabling': False
             })
 
         for container in self.argument_containers:
             if hasattr(container, 'verify_usage_handler'):
                 container.verify_usage_handler(args)
 
         return args
 
--- a/testing/mozharness/configs/unittests/linux_unittest.py
+++ b/testing/mozharness/configs/unittests/linux_unittest.py
@@ -247,31 +247,33 @@ config = {
         "reftest-ipc": {
             "env": {
                 "MOZ_OMTC_ENABLED": "1",
                 "MOZ_DISABLE_CONTEXT_SHARING_GLX": "1"
             },
             "options": ["--suite=reftest",
                         "--setpref=browser.tabs.remote=true",
                         "--setpref=browser.tabs.remote.autostart=true",
+                        "--setpref=extensions.e10sBlocksEnabling=false",
                         "--setpref=layers.async-pan-zoom.enabled=true"],
             "tests": ["tests/reftest/tests/layout/reftests/reftest-sanity/reftest.list"]
         },
         "reftest-no-accel": {
             "options": ["--suite=reftest",
                         "--setpref=layers.acceleration.force-enabled=disabled"],
             "tests": ["tests/reftest/tests/layout/reftests/reftest.list"]},
         "crashtest-ipc": {
             "env": {
                 "MOZ_OMTC_ENABLED": "1",
                 "MOZ_DISABLE_CONTEXT_SHARING_GLX": "1"
             },
             "options": ["--suite=crashtest",
                         "--setpref=browser.tabs.remote=true",
                         "--setpref=browser.tabs.remote.autostart=true",
+                        "--setpref=extensions.e10sBlocksEnabling=false",
                         "--setpref=layers.async-pan-zoom.enabled=true"],
             "tests": ["tests/reftest/tests/testing/crashtest/crashtests.list"]
         },
     },
     "all_xpcshell_suites": {
         "xpcshell": {
             "options": ["--xpcshell=%(abs_app_dir)s/" + XPCSHELL_NAME,
                         "--manifest=tests/xpcshell/tests/xpcshell.ini"],
--- a/testing/mozharness/configs/unittests/mac_unittest.py
+++ b/testing/mozharness/configs/unittests/mac_unittest.py
@@ -190,23 +190,25 @@ config = {
         "jsreftest": {
             'options':["--extra-profile-file=tests/jsreftest/tests/user.js"],
             'tests': ["tests/jsreftest/tests/jstests.list"]
         },
         "reftest-ipc": {
             'options': ['--suite=reftest',
                         '--setpref=browser.tabs.remote=true',
                         '--setpref=browser.tabs.remote.autostart=true',
+                        '--setpref=extensions.e10sBlocksEnabling=false',
                         '--setpref=layers.async-pan-zoom.enabled=true'],
             'tests': ['tests/reftest/tests/layout/reftests/reftest-sanity/reftest.list']
         },
         "crashtest-ipc": {
             'options': ['--suite=crashtest',
                         '--setpref=browser.tabs.remote=true',
                         '--setpref=browser.tabs.remote.autostart=true',
+                        '--setpref=extensions.e10sBlocksEnabling=false',
                         '--setpref=layers.async-pan-zoom.enabled=true'],
             'tests': ['tests/reftest/tests/testing/crashtest/crashtests.list']
         },
     },
     "all_xpcshell_suites": {
         "xpcshell": {
             'options': ["--xpcshell=%(abs_app_dir)s/" + XPCSHELL_NAME,
                         "--manifest=tests/xpcshell/tests/xpcshell.ini"],
--- a/testing/mozharness/configs/unittests/win_unittest.py
+++ b/testing/mozharness/configs/unittests/win_unittest.py
@@ -202,16 +202,17 @@ config = {
         "jsreftest": {
             'options':["--extra-profile-file=tests/jsreftest/tests/user.js"],
             'tests': ["tests/jsreftest/tests/jstests.list"]
         },
         "reftest-ipc": {
             'options': ['--suite=reftest',
                         '--setpref=browser.tabs.remote=true',
                         '--setpref=browser.tabs.remote.autostart=true',
+                        '--setpref=extensions.e10sBlocksEnabling=false',
                         '--setpref=layers.async-pan-zoom.enabled=true'],
             'tests': ['tests/reftest/tests/layout/reftests/reftest-sanity/reftest.list']
         },
         "reftest-no-accel": {
             "options": ["--suite=reftest",
                         "--setpref=gfx.direct2d.disabled=true",
                         "--setpref=layers.acceleration.disabled=true"],
             "tests": ["tests/reftest/tests/layout/reftests/reftest.list"]
@@ -220,16 +221,17 @@ config = {
             "options": ["--suite=reftest",
                         "--setpref=layers.offmainthreadcomposition.enabled=true"],
             "tests": ["tests/reftest/tests/layout/reftests/reftest.list"]
         },
         "crashtest-ipc": {
             "options": ["--suite=crashtest",
                         '--setpref=browser.tabs.remote=true',
                         '--setpref=browser.tabs.remote.autostart=true',
+                        '--setpref=extensions.e10sBlocksEnabling=false',
                         '--setpref=layers.async-pan-zoom.enabled=true'],
             "tests": ['tests/reftest/tests/testing/crashtest/crashtests.list'],
         },
     },
     "all_xpcshell_suites": {
         "xpcshell": {
             'options': ["--xpcshell=%(abs_app_dir)s/" + XPCSHELL_NAME,
                         "--manifest=tests/xpcshell/tests/xpcshell.ini"],
--- a/testing/profiles/prefs_general.js
+++ b/testing/profiles/prefs_general.js
@@ -308,16 +308,19 @@ user_pref("media.decoder.heuristic.dorma
 // Don't prompt about e10s
 user_pref("browser.displayedE10SPrompt.1", 5);
 // Don't use auto-enabled e10s
 user_pref("browser.tabs.remote.autostart.1", false);
 user_pref("browser.tabs.remote.autostart.2", false);
 // Don't forceably kill content processes after a timeout
 user_pref("dom.ipc.tabs.shutdownTimeoutSecs", 0);
 
+// Don't block add-ons for e10s
+user_pref("extensions.e10sBlocksEnabling", false);
+
 // Avoid performing Reader Mode intros during tests.
 user_pref("browser.reader.detectedFirstArticle", true);
 
 // Don't let PAC generator to set PAC, as mochitest framework has its own PAC
 // rules during testing.
 user_pref("network.proxy.pac_generator", false);
 
 // Make tests run consistently on DevEdition (which has a lightweight theme
--- a/testing/talos/talos/config.py
+++ b/testing/talos/talos/config.py
@@ -261,16 +261,17 @@ def set_webserver(config):
     config['webserver'] = 'localhost:%d' % port
 
 
 @validator
 def update_prefs(config):
     # if e10s is enabled, set prefs accordingly
     if config['e10s']:
         config['preferences']['browser.tabs.remote.autostart'] = True
+        config['preferences']['extensions.e10sBlocksEnabling'] = False
     else:
         config['preferences']['browser.tabs.remote.autostart'] = False
         config['preferences']['browser.tabs.remote.autostart.1'] = False
         config['preferences']['browser.tabs.remote.autostart.2'] = False
 
     # update prefs from command line
     prefs = config.pop('extraPrefs')
     if prefs: