summaryrefslogtreecommitdiffstats
path: root/toolkit/mozapps/extensions/test/xpcshell/test_locked2.js
diff options
context:
space:
mode:
Diffstat (limited to 'toolkit/mozapps/extensions/test/xpcshell/test_locked2.js')
-rw-r--r--toolkit/mozapps/extensions/test/xpcshell/test_locked2.js11
1 files changed, 3 insertions, 8 deletions
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_locked2.js b/toolkit/mozapps/extensions/test/xpcshell/test_locked2.js
index 4a62c585f..10b13c9f6 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_locked2.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_locked2.js
@@ -71,7 +71,7 @@ var addon5 = {
const profileDir = gProfD.clone();
profileDir.append("extensions");
-add_task(function*() {
+add_task(function() {
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "2", "2");
@@ -217,12 +217,7 @@ add_task(function*() {
// After allowing access to the original DB things should still be
// back how they were before the lock
- let shutdownError;
- try {
- shutdownManager();
- } catch (e) {
- shutdownError = e;
- }
+ shutdownManager();
yield file.close();
gExtensionsJSON.permissions = filePermissions;
startupManager();
@@ -231,7 +226,7 @@ add_task(function*() {
// readable, so our changes were saved. On Windows,
// these things happened when we had no access to the database so
// they are seen as external changes when we get the database back
- if (shutdownError) {
+ if (gXPISaveError) {
do_print("Previous XPI save failed");
check_startup_changes(AddonManager.STARTUP_CHANGE_INSTALLED,
["addon6@tests.mozilla.org"]);