Bug 1427835 - Remove redundant TPS addon test and disable validation on the non-restartless XPI test r=markh

MozReview-Commit-ID: JxNw7qIOheo

--HG--
extra : rebase_source : 33bf748394a248178c85292464c8acccf9e106b8
This commit is contained in:
Thom Chiovoloni 2018-01-03 15:01:49 -05:00
parent 4e3d9fc756
commit 4f926a87dd
3 changed files with 24 additions and 43 deletions

View File

@ -21,7 +21,6 @@
"test_bookmarks_in_same_named_folder.js",
"test_client_wipe.js",
"test_special_tabs.js",
"test_addon_sanity.js",
"test_addon_restartless_xpi.js",
"test_addon_nonrestartless_xpi.js",
"test_addon_reconciling.js",

View File

@ -30,19 +30,23 @@ const id = "unsigned-xpi@tests.mozilla.org";
Phase("phase01", [
[Addons.verifyNot, [id]],
[Addons.install, [id]],
[Sync]
[Sync],
[Addons.skipValidation] // Validation disabled due to bug 1427835
]);
Phase("phase02", [
[Addons.verify, [id], STATE_ENABLED],
[Sync]
[Sync],
[Addons.skipValidation] // Validation disabled due to bug 1427835
]);
Phase("phase03", [
[Addons.verifyNot, [id]],
[Sync]
[Sync],
[Addons.skipValidation] // Validation disabled due to bug 1427835
]);
Phase("phase04", [
[Addons.verify, [id], STATE_ENABLED],
[Sync]
[Sync],
[Addons.skipValidation] // Validation disabled due to bug 1427835
]);
// Now we disable the add-on
@ -72,19 +76,23 @@ Phase("phase08", [
Phase("phase09", [
[EnsureTracking],
[Addons.setEnabled, [id], STATE_ENABLED],
[Sync]
[Sync],
[Addons.skipValidation] // Validation disabled due to bug 1427835
]);
Phase("phase10", [
[Addons.verify, [id], STATE_ENABLED],
[Sync]
[Sync],
[Addons.skipValidation] // Validation disabled due to bug 1427835
]);
Phase("phase11", [
[Addons.verify, [id], STATE_DISABLED],
[Sync]
[Sync],
[Addons.skipValidation] // Validation disabled due to bug 1427835
]);
Phase("phase12", [
[Addons.verify, [id], STATE_ENABLED],
[Sync]
[Sync],
[Addons.skipValidation] // Validation disabled due to bug 1427835
]);
// And we uninstall it
@ -93,17 +101,21 @@ Phase("phase13", [
[EnsureTracking],
[Addons.verify, [id], STATE_ENABLED],
[Addons.uninstall, [id]],
[Sync]
[Sync],
[Addons.skipValidation] // Validation disabled due to bug 1427835
]);
Phase("phase14", [
[Addons.verifyNot, [id]],
[Sync]
[Sync],
[Addons.skipValidation] // Validation disabled due to bug 1427835
]);
Phase("phase15", [
[Addons.verify, [id], STATE_ENABLED],
[Sync]
[Sync],
[Addons.skipValidation] // Validation disabled due to bug 1427835
]);
Phase("phase16", [
[Addons.verifyNot, [id]],
[Sync]
[Sync],
[Addons.skipValidation] // Validation disabled due to bug 1427835
]);

View File

@ -1,30 +0,0 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
/*
* The list of phases mapped to their corresponding profiles. The object
* here must be in strict JSON format, as it will get parsed by the Python
* testrunner (no single quotes, extra comma's, etc).
*/
EnableEngines(["addons"]);
var phases = { "phase1": "profile1",
"phase2": "profile1" };
const id = "unsigned-xpi@tests.mozilla.org";
Phase("phase1", [
[Addons.install, [id]],
// Non-restartless add-on shouldn't be found after install.
[Addons.verifyNot, [id]],
// But it should be marked for Sync.
[Sync]
]);
Phase("phase2", [
// Add-on should be present after restart
[Addons.verify, [id], STATE_ENABLED],
[Sync] // Sync to ensure everything is initialized enough for the addon validator to run
]);