зеркало из https://github.com/mozilla/gecko-dev.git
Bug 592943 - (1/3) Fix addon manager tests, r=mossop
This commit is contained in:
Родитель
3c0e4b2d34
Коммит
202766c292
|
@ -14,10 +14,6 @@ const Ci = Components.interfaces;
|
|||
const extDir = gProfD.clone();
|
||||
extDir.append("extensions");
|
||||
|
||||
var gFastLoadService = AM_Cc["@mozilla.org/fast-load-service;1"].
|
||||
getService(AM_Ci.nsIFastLoadService);
|
||||
var gFastLoadFile = null;
|
||||
|
||||
var gCachePurged = false;
|
||||
|
||||
// Override the window watcher
|
||||
|
@ -64,19 +60,12 @@ function run_test() {
|
|||
}, "startupcache-invalidate", false);
|
||||
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1");
|
||||
|
||||
gFastLoadFile = gFastLoadService.newFastLoadFile("XUL");
|
||||
do_check_false(gFastLoadFile.exists());
|
||||
gFastLoadFile.create(AM_Ci.nsIFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
|
||||
|
||||
startupManager();
|
||||
// nsAppRunner takes care of clearing this when a new app is installed
|
||||
do_check_true(gFastLoadFile.exists());
|
||||
do_check_false(gCachePurged);
|
||||
|
||||
installAllFiles([do_get_addon("test_bug594058")], function() {
|
||||
restartManager();
|
||||
do_check_false(gFastLoadFile.exists());
|
||||
gFastLoadFile.create(AM_Ci.nsIFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
|
||||
do_check_true(gCachePurged);
|
||||
gCachePurged = false;
|
||||
|
||||
|
@ -93,19 +82,14 @@ function run_test() {
|
|||
otherFile.lastModifiedTime = pastTime;
|
||||
|
||||
restartManager();
|
||||
do_check_false(gFastLoadFile.exists());
|
||||
gFastLoadFile.create(AM_Ci.nsIFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
|
||||
gCachePurged = false;
|
||||
|
||||
otherFile.lastModifiedTime = pastTime + 5000;
|
||||
restartManager();
|
||||
do_check_false(gFastLoadFile.exists());
|
||||
gFastLoadFile.create(AM_Ci.nsIFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
|
||||
do_check_true(gCachePurged);
|
||||
gCachePurged = false;
|
||||
|
||||
restartManager();
|
||||
do_check_true(gFastLoadFile.exists());
|
||||
do_check_false(gCachePurged);
|
||||
|
||||
// Upgrading the app should force a cache flush due to potentially showing
|
||||
|
|
|
@ -85,18 +85,21 @@ registerDirectory("XREUSysExt", userDir.parent);
|
|||
const profileDir = gProfD.clone();
|
||||
profileDir.append("extensions");
|
||||
|
||||
var gFastLoadService = AM_Cc["@mozilla.org/fast-load-service;1"].
|
||||
getService(AM_Ci.nsIFastLoadService);
|
||||
var gFastLoadFile = null;
|
||||
var gCachePurged = false;
|
||||
|
||||
// Set up the profile
|
||||
function run_test() {
|
||||
do_test_pending();
|
||||
startupManager();
|
||||
|
||||
gFastLoadFile = gFastLoadService.newFastLoadFile("XUL");
|
||||
do_check_false(gFastLoadFile.exists());
|
||||
gFastLoadFile.create(AM_Ci.nsIFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
|
||||
let obs = AM_Cc["@mozilla.org/observer-service;1"].
|
||||
getService(AM_Ci.nsIObserverService);
|
||||
obs.addObserver({
|
||||
observe: function(aSubject, aTopic, aData) {
|
||||
gCachePurged = true;
|
||||
}
|
||||
}, "startupcache-invalidate", false);
|
||||
|
||||
startupManager();
|
||||
|
||||
AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
|
||||
"addon2@tests.mozilla.org",
|
||||
|
@ -134,9 +137,9 @@ function run_test_1() {
|
|||
writeInstallRDFForExtension(addon4, profileDir);
|
||||
writeInstallRDFForExtension(addon5, profileDir);
|
||||
|
||||
gCachePurged = false;
|
||||
restartManager();
|
||||
do_check_false(gFastLoadFile.exists());
|
||||
gFastLoadFile.create(AM_Ci.nsIFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
|
||||
do_check_true(gCachePurged);
|
||||
|
||||
AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
|
||||
"addon2@tests.mozilla.org",
|
||||
|
@ -213,9 +216,9 @@ function run_test_2() {
|
|||
dest.append(do_get_expected_addon_name("addon3@tests.mozilla.org"));
|
||||
dest.remove(true);
|
||||
|
||||
gCachePurged = false;
|
||||
restartManager();
|
||||
do_check_false(gFastLoadFile.exists());
|
||||
gFastLoadFile.create(AM_Ci.nsIFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
|
||||
do_check_true(gCachePurged);
|
||||
|
||||
AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
|
||||
"addon2@tests.mozilla.org",
|
||||
|
@ -269,9 +272,9 @@ function run_test_3() {
|
|||
dest.remove(true);
|
||||
writeInstallRDFForExtension(addon3, profileDir, "addon4@tests.mozilla.org");
|
||||
|
||||
gCachePurged = false;
|
||||
restartManager();
|
||||
do_check_false(gFastLoadFile.exists());
|
||||
gFastLoadFile.create(AM_Ci.nsIFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
|
||||
do_check_true(gCachePurged);
|
||||
|
||||
AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
|
||||
"addon2@tests.mozilla.org",
|
||||
|
@ -322,9 +325,9 @@ function run_test_3() {
|
|||
function run_test_4() {
|
||||
Services.prefs.setIntPref("extensions.enabledScopes", AddonManager.SCOPE_SYSTEM);
|
||||
|
||||
gCachePurged = false;
|
||||
restartManager();
|
||||
do_check_false(gFastLoadFile.exists());
|
||||
gFastLoadFile.create(AM_Ci.nsIFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
|
||||
do_check_true(gCachePurged);
|
||||
|
||||
AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
|
||||
"addon2@tests.mozilla.org",
|
||||
|
@ -356,9 +359,9 @@ function run_test_4() {
|
|||
function run_test_5() {
|
||||
Services.prefs.setIntPref("extensions.enabledScopes", AddonManager.SCOPE_USER);
|
||||
|
||||
gCachePurged = false;
|
||||
restartManager();
|
||||
do_check_false(gFastLoadFile.exists());
|
||||
gFastLoadFile.create(AM_Ci.nsIFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
|
||||
do_check_true(gCachePurged);
|
||||
|
||||
AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
|
||||
"addon2@tests.mozilla.org",
|
||||
|
@ -396,9 +399,9 @@ function run_test_5() {
|
|||
function run_test_6() {
|
||||
Services.prefs.clearUserPref("extensions.enabledScopes");
|
||||
|
||||
gCachePurged = false;
|
||||
restartManager();
|
||||
do_check_false(gFastLoadFile.exists());
|
||||
gFastLoadFile.create(AM_Ci.nsIFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
|
||||
do_check_true(gCachePurged);
|
||||
|
||||
AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
|
||||
"addon2@tests.mozilla.org",
|
||||
|
@ -440,9 +443,9 @@ function run_test_7() {
|
|||
dest.append(do_get_expected_addon_name("addon2@tests.mozilla.org"));
|
||||
dest.remove(true);
|
||||
|
||||
gCachePurged = false;
|
||||
restartManager();
|
||||
do_check_false(gFastLoadFile.exists());
|
||||
gFastLoadFile.create(AM_Ci.nsIFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
|
||||
do_check_true(gCachePurged);
|
||||
|
||||
AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
|
||||
"addon2@tests.mozilla.org",
|
||||
|
@ -489,9 +492,9 @@ function run_test_7() {
|
|||
function run_test_8() {
|
||||
Services.prefs.setIntPref("extensions.enabledScopes", 0);
|
||||
|
||||
gCachePurged = false;
|
||||
restartManager();
|
||||
do_check_false(gFastLoadFile.exists());
|
||||
gFastLoadFile.create(AM_Ci.nsIFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
|
||||
do_check_true(gCachePurged);
|
||||
|
||||
AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
|
||||
"addon2@tests.mozilla.org",
|
||||
|
@ -532,9 +535,9 @@ function run_test_9() {
|
|||
addon2.version = "2.4";
|
||||
writeInstallRDFForExtension(addon2, profileDir);
|
||||
|
||||
gCachePurged = false;
|
||||
restartManager();
|
||||
do_check_false(gFastLoadFile.exists());
|
||||
gFastLoadFile.create(AM_Ci.nsIFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
|
||||
do_check_true(gCachePurged);
|
||||
|
||||
AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
|
||||
"addon2@tests.mozilla.org",
|
||||
|
@ -584,9 +587,9 @@ function run_test_10() {
|
|||
addon1.version = "1.3";
|
||||
writeInstallRDFForExtension(addon1, userDir);
|
||||
|
||||
gCachePurged = false;
|
||||
restartManager();
|
||||
do_check_false(gFastLoadFile.exists());
|
||||
gFastLoadFile.create(AM_Ci.nsIFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
|
||||
do_check_true(gCachePurged);
|
||||
|
||||
AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
|
||||
"addon2@tests.mozilla.org",
|
||||
|
@ -636,9 +639,9 @@ function run_test_11() {
|
|||
dest.append(do_get_expected_addon_name("addon2@tests.mozilla.org"));
|
||||
dest.remove(true);
|
||||
|
||||
gCachePurged = false;
|
||||
restartManager();
|
||||
do_check_false(gFastLoadFile.exists());
|
||||
gFastLoadFile.create(AM_Ci.nsIFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
|
||||
do_check_true(gCachePurged);
|
||||
|
||||
AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
|
||||
"addon2@tests.mozilla.org",
|
||||
|
|
Загрузка…
Ссылка в новой задаче