Bug 1427835 - Remove redundant TPS addon test and disable validation on the non-restartless XPI test r?markh
MozReview-Commit-ID: JxNw7qIOheo
--- a/services/sync/tests/tps/all_tests.json
+++ b/services/sync/tests/tps/all_tests.json
@@ -16,17 +16,16 @@
"test_bug575423.js",
"test_bug546807.js",
"test_history_collision.js",
"test_privbrw_passwords.js",
"test_privbrw_tabs.js",
"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",
"test_addon_wipe.js",
"test_existing_bookmarks.js"
]
}
--- a/services/sync/tests/tps/test_addon_nonrestartless_xpi.js
+++ b/services/sync/tests/tps/test_addon_nonrestartless_xpi.js
@@ -25,29 +25,33 @@ var phases = {
"phase16": "profile2"
};
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
Phase("phase05", [
[EnsureTracking],
[Addons.setEnabled, [id], STATE_DISABLED],
[Sync],
[Addons.skipValidation] // Validation disabled due to bug 1380472
@@ -67,43 +71,51 @@ Phase("phase08", [
[Sync],
[Addons.skipValidation] // Validation disabled due to bug 1380472
]);
// Now we re-enable it again.
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
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
]);
deleted file mode 100644
--- a/services/sync/tests/tps/test_addon_sanity.js
+++ /dev/null
@@ -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
-]);