Bug 1352204 Fix test issues with non-MPC extensions r=kmag

Continue to allow non-multiprocessCompatible extensions in automation.
There are a ton of places that would need to be changed, many of which
will be changing soon anyway with the non-webextensions change in 57
so this is mostly the expedient route to keeping the tree green.

MozReview-Commit-ID: EZZoDVdhLfy

--HG--
extra : rebase_source : f83472bc1c88dd0deadbe485d9002499027ff07f
This commit is contained in:
Andrew Swan 2017-05-03 08:02:51 -07:00
Родитель fd16ec7749
Коммит 79a787c063
8 изменённых файлов: 15 добавлений и 0 удалений

Просмотреть файл

@ -18,6 +18,7 @@
</em:targetApplication>
<em:unpack>true</em:unpack>
<em:multiprocessCompatible>true</em:multiprocessCompatible>
</Description>
</RDF>

Просмотреть файл

@ -20,6 +20,8 @@ user_pref("media.autoplay.enabled", true);
user_pref("app.update.enabled", false);
user_pref("app.update.staging.enabled", false);
user_pref("app.update.url.android", "");
// Ensure we can load the reftest extension
user_pref("extensions.allow-non-mpc-extensions", true);
// Disable addon updates and prefetching so we don't leak them
user_pref("extensions.update.enabled", false);
user_pref("extensions.systemAddon.update.url", "http://localhost/dummy-system-addons.xml");

Просмотреть файл

@ -18,6 +18,7 @@ class TestNotifications(PuppeteerMixin, MarionetteTestCase):
super(TestNotifications, self).setUp()
self.marionette.set_pref('extensions.install.requireSecureOrigin', False)
self.marionette.set_pref('extensions.allow-non-mpc-extensions', True)
self.addons_url = self.marionette.absolute_url('addons/extensions/')
self.puppeteer.utils.permissions.add(self.marionette.baseurl, 'install')
@ -25,6 +26,7 @@ class TestNotifications(PuppeteerMixin, MarionetteTestCase):
def tearDown(self):
try:
self.marionette.clear_pref('extensions.install.requireSecureOrigin')
self.marionette.clear_pref('extensions.allow-non-mpc-extensions')
self.marionette.clear_pref('xpinstall.signatures.required')
self.puppeteer.utils.permissions.remove(self.addons_url, 'install')

Двоичный файл не отображается.

Просмотреть файл

@ -88,6 +88,7 @@ user_pref("extensions.installDistroAddons", false);
// XPI extensions are required for test harnesses to load
user_pref("extensions.defaultProviders.enabled", true);
user_pref("xpinstall.signatures.required", false);
user_pref("extensions.allow-non-mpc-extensions", true);
user_pref("geo.wifi.uri", "http://%(server)s/tests/dom/tests/mochitest/geolocation/network_geolocation.sjs");
user_pref("geo.wifi.timeToWaitBeforeSending", 2000);

Просмотреть файл

@ -120,6 +120,8 @@ def run_tests(config, browser_config):
if browser_config['develop'] or browser_config['branch_name'] == 'Try':
browser_config['preferences']['xpinstall.signatures.required'] = False
browser_config['preferences']['extensions.allow-non-mpc-extensions'] = True
# set defaults
testdate = config.get('testdate', '')

Просмотреть файл

@ -853,6 +853,9 @@ add_task(function* setup() {
// Spoof the the hotfixVersion
Preferences.set("extensions.hotfix.lastVersion", APP_HOTFIX_VERSION);
// Allow non-multiprocessCompatible extensions
Preferences.set("extensions.allow-non-mpc-extensions", true);
// Create the attribution data file, so that settings.attribution will exist.
// The attribution functionality only exists in Firefox.
if (AppConstants.MOZ_BUILD_APP == "browser") {

Просмотреть файл

@ -23,6 +23,7 @@ const PREF_XPI_SIGNATURES_REQUIRED = "xpinstall.signatures.required";
const PREF_SYSTEM_ADDON_SET = "extensions.systemAddonSet";
const PREF_SYSTEM_ADDON_UPDATE_URL = "extensions.systemAddon.update.url";
const PREF_APP_UPDATE_ENABLED = "app.update.enabled";
const PREF_ALLOW_NON_MPC = "extensions.allow-non-mpc-extensions";
// Forcibly end the test if it runs longer than 15 minutes
const TIMEOUT_MS = 900000;
@ -1089,6 +1090,9 @@ Services.prefs.setCharPref(PREF_EM_MIN_COMPAT_PLATFORM_VERSION, "0");
// Ensure signature checks are enabled by default
Services.prefs.setBoolPref(PREF_XPI_SIGNATURES_REQUIRED, true);
// Allow non-multiprocessCompatible extensions for now
Services.prefs.setBoolPref(PREF_ALLOW_NON_MPC, true);
// Copies blocklistFile (an nsIFile) to gProfD/blocklist.xml.
function copyBlocklistToProfile(blocklistFile) {