Backed out 2 changesets (bug 1834831) for causing node failures with checkBundles CLOSED TREE
Backed out changeset 58b351a155c8 (bug 1834831) Backed out changeset 1acbb5231d14 (bug 1834831)
This commit is contained in:
@@ -7,12 +7,15 @@ const { AddonTestUtils } = ChromeUtils.importESModule(
|
||||
);
|
||||
|
||||
ChromeUtils.defineESModuleGetters(this, {
|
||||
HomePage: "resource:///modules/HomePage.sys.mjs",
|
||||
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
|
||||
TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.sys.mjs",
|
||||
sinon: "resource://testing-common/Sinon.sys.mjs",
|
||||
});
|
||||
|
||||
XPCOMUtils.defineLazyModuleGetters(this, {
|
||||
HomePage: "resource:///modules/HomePage.jsm",
|
||||
});
|
||||
|
||||
function promisePrefChanged(expectedValue) {
|
||||
return TestUtils.waitForPrefChange("browser.startup.homepage", value =>
|
||||
value.endsWith(expectedValue)
|
||||
|
||||
@@ -8,12 +8,15 @@ const { AddonTestUtils } = ChromeUtils.importESModule(
|
||||
|
||||
ChromeUtils.defineESModuleGetters(this, {
|
||||
AddonManager: "resource://gre/modules/AddonManager.sys.mjs",
|
||||
HomePage: "resource:///modules/HomePage.sys.mjs",
|
||||
PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
|
||||
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
|
||||
sinon: "resource://testing-common/Sinon.sys.mjs",
|
||||
});
|
||||
|
||||
XPCOMUtils.defineLazyModuleGetters(this, {
|
||||
HomePage: "resource:///modules/HomePage.jsm",
|
||||
});
|
||||
|
||||
AddonTestUtils.init(this);
|
||||
AddonTestUtils.overrideCertDB();
|
||||
|
||||
|
||||
@@ -5,9 +5,7 @@
|
||||
const { AddonTestUtils } = ChromeUtils.importESModule(
|
||||
"resource://testing-common/AddonTestUtils.sys.mjs"
|
||||
);
|
||||
const { HomePage } = ChromeUtils.importESModule(
|
||||
"resource:///modules/HomePage.sys.mjs"
|
||||
);
|
||||
const { HomePage } = ChromeUtils.import("resource:///modules/HomePage.jsm");
|
||||
const { ExtensionPermissions } = ChromeUtils.importESModule(
|
||||
"resource://gre/modules/ExtensionPermissions.sys.mjs"
|
||||
);
|
||||
|
||||
@@ -3,9 +3,11 @@
|
||||
"use strict";
|
||||
|
||||
// Load lazy so we create the app info first.
|
||||
ChromeUtils.defineESModuleGetters(this, {
|
||||
PageActions: "resource:///modules/PageActions.sys.mjs",
|
||||
});
|
||||
ChromeUtils.defineModuleGetter(
|
||||
this,
|
||||
"PageActions",
|
||||
"resource:///modules/PageActions.jsm"
|
||||
);
|
||||
|
||||
const { AddonTestUtils } = ChromeUtils.importESModule(
|
||||
"resource://testing-common/AddonTestUtils.sys.mjs"
|
||||
|
||||
@@ -10,8 +10,8 @@ const { AddonManager } = ChromeUtils.importESModule(
|
||||
"resource://gre/modules/AddonManager.sys.mjs"
|
||||
);
|
||||
|
||||
const { AboutNewTab } = ChromeUtils.importESModule(
|
||||
"resource:///modules/AboutNewTab.sys.mjs"
|
||||
const { AboutNewTab } = ChromeUtils.import(
|
||||
"resource:///modules/AboutNewTab.jsm"
|
||||
);
|
||||
|
||||
// Lazy load to avoid having Services.appinfo cached first.
|
||||
@@ -19,9 +19,7 @@ ChromeUtils.defineESModuleGetters(this, {
|
||||
ExtensionParent: "resource://gre/modules/ExtensionParent.sys.mjs",
|
||||
});
|
||||
|
||||
const { HomePage } = ChromeUtils.importESModule(
|
||||
"resource:///modules/HomePage.sys.mjs"
|
||||
);
|
||||
const { HomePage } = ChromeUtils.import("resource:///modules/HomePage.jsm");
|
||||
|
||||
AddonTestUtils.init(this);
|
||||
|
||||
|
||||
@@ -7,8 +7,8 @@ ChromeUtils.defineESModuleGetters(this, {
|
||||
Management: "resource://gre/modules/Extension.sys.mjs",
|
||||
});
|
||||
|
||||
const { AboutNewTab } = ChromeUtils.importESModule(
|
||||
"resource:///modules/AboutNewTab.sys.mjs"
|
||||
const { AboutNewTab } = ChromeUtils.import(
|
||||
"resource:///modules/AboutNewTab.jsm"
|
||||
);
|
||||
|
||||
const { AddonTestUtils } = ChromeUtils.importESModule(
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
/* vim: set sts=2 sw=2 et tw=80: */
|
||||
"use strict";
|
||||
|
||||
const { AboutNewTab } = ChromeUtils.importESModule(
|
||||
"resource:///modules/AboutNewTab.sys.mjs"
|
||||
const { AboutNewTab } = ChromeUtils.import(
|
||||
"resource:///modules/AboutNewTab.jsm"
|
||||
);
|
||||
|
||||
const { AddonTestUtils } = ChromeUtils.importESModule(
|
||||
|
||||
Reference in New Issue
Block a user