Bug 1422496 - Part 1: make sure install/uninstall complete; r=aswan

MozReview-Commit-ID: DaUuhHNB8Yb
This commit is contained in:
Liang-Heng Chen 2018-01-09 17:20:00 +02:00
parent 08c2334fa4
commit 8dbcf63110

View File

@ -1176,8 +1176,8 @@ add_task(async function test_addonsWatch_NotInterestingChange() {
deferred.resolve();
});
await AddonManagerTesting.installXPIFromURL(DICTIONARY_ADDON_INSTALL_URL);
await AddonManagerTesting.installXPIFromURL(INTERESTING_ADDON_INSTALL_URL);
let dictionaryAddon = await AddonManagerTesting.installXPIFromURL(DICTIONARY_ADDON_INSTALL_URL);
let interestingAddon = await AddonManagerTesting.installXPIFromURL(INTERESTING_ADDON_INSTALL_URL);
await deferred.promise;
Assert.ok(!("telemetry-dictionary@tests.mozilla.org" in
@ -1185,6 +1185,10 @@ add_task(async function test_addonsWatch_NotInterestingChange() {
"Dictionaries should not appear in active addons.");
TelemetryEnvironment.unregisterChangeListener("testNotInteresting");
dictionaryAddon.uninstall();
await interestingAddon.startupPromise;
interestingAddon.uninstall();
});
add_task(async function test_addonsAndPlugins() {
@ -1268,7 +1272,7 @@ add_task(async function test_addonsAndPlugins() {
);
// Install an add-on so we have some data.
await AddonManagerTesting.installXPIFromURL(ADDON_INSTALL_URL);
let addon = await AddonManagerTesting.installXPIFromURL(ADDON_INSTALL_URL);
// Install a webextension as well.
ExtensionTestUtils.init(this);
@ -1338,7 +1342,8 @@ add_task(async function test_addonsAndPlugins() {
Assert.equal(data.addons.persona, PERSONA_ID, "The correct Persona Id must be reported.");
// Uninstall the addon.
await AddonManagerTesting.uninstallAddonByID(ADDON_ID);
await addon.startupPromise;
addon.uninstall();
});
add_task(async function test_signedAddon() {
@ -1367,7 +1372,7 @@ add_task(async function test_signedAddon() {
TelemetryEnvironment.registerChangeListener("test_signedAddon", deferred.resolve);
// Install the addon.
await AddonManagerTesting.installXPIFromURL(ADDON_INSTALL_URL);
let addon = await AddonManagerTesting.installXPIFromURL(ADDON_INSTALL_URL);
await deferred.promise;
// Unregister the listener.
@ -1384,6 +1389,8 @@ add_task(async function test_signedAddon() {
}
AddonTestUtils.useRealCertChecks = false;
await addon.startupPromise;
addon.uninstall();
});
add_task(async function test_addonsFieldsLimit() {
@ -1393,7 +1400,7 @@ add_task(async function test_addonsFieldsLimit() {
// Install the addon and wait for the TelemetryEnvironment to pick it up.
let deferred = PromiseUtils.defer();
TelemetryEnvironment.registerChangeListener("test_longFieldsAddon", deferred.resolve);
await AddonManagerTesting.installXPIFromURL(ADDON_INSTALL_URL);
let addon = await AddonManagerTesting.installXPIFromURL(ADDON_INSTALL_URL);
await deferred.promise;
TelemetryEnvironment.unregisterChangeListener("test_longFieldsAddon");
@ -1412,6 +1419,9 @@ add_task(async function test_addonsFieldsLimit() {
"The name string must have been limited");
Assert.lessOrEqual(targetAddon.description.length, 100,
"The description string must have been limited");
await addon.startupPromise;
addon.uninstall();
});
add_task(async function test_collectionWithbrokenAddonData() {
@ -1470,7 +1480,7 @@ add_task(async function test_collectionWithbrokenAddonData() {
// Now install an addon which returns the correct information.
checkpointPromise = registerCheckpointPromise(2);
await AddonManagerTesting.installXPIFromURL(ADDON_INSTALL_URL);
let addon = await AddonManagerTesting.installXPIFromURL(ADDON_INSTALL_URL);
await checkpointPromise;
assertCheckpoint(2);
@ -1493,7 +1503,8 @@ add_task(async function test_collectionWithbrokenAddonData() {
AddonManagerPrivate.unregisterProvider(brokenAddonProvider);
// Uninstall the valid addon.
await AddonManagerTesting.uninstallAddonByID(ADDON_ID);
await addon.startupPromise;
addon.uninstall();
});
add_task(async function test_defaultSearchEngine() {