From 91ecf90f1a02e1779fd356747bad10f43ef63707 Mon Sep 17 00:00:00 2001 From: Dave Townsend Date: Mon, 26 Apr 2010 11:41:20 -0700 Subject: [PATCH] Bug 559877: Fix timeout in test_bug559800.js. r=robstrong --- .../test/xpcshell/test_bug559800.js | 34 +++---------------- 1 file changed, 5 insertions(+), 29 deletions(-) diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug559800.js b/toolkit/mozapps/extensions/test/xpcshell/test_bug559800.js index 73c61da70027..4cbeabfbb494 100644 --- a/toolkit/mozapps/extensions/test/xpcshell/test_bug559800.js +++ b/toolkit/mozapps/extensions/test/xpcshell/test_bug559800.js @@ -9,6 +9,7 @@ const profileDir = gProfD.clone(); profileDir.append("extensions"); function run_test() { + do_test_pending(); createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9.2"); var dest = profileDir.clone(); @@ -25,36 +26,11 @@ function run_test() { name: "Test Addon 1", }, dest); + // Make it look like the detabase was created previously + Services.prefs.setIntPref("extensions.databaseSchema", 1); + startupManager(1); - do_test_pending(); - - run_test_1(); -} - -function end_test() { - do_test_finished(); -} - -function run_test_1() { - AddonManager.getAddonByID("addon1@tests.mozilla.org", function(a1) { - do_check_neq(a1, null); - do_check_eq(a1.version, "1.0"); - - let db = gProfD.clone(); - db.append("extensions.sqlite"); - db.remove(true); - - shutdownManager(); - // DB shutdown can be asynchronous, normally this isn't a problem but we - // can't delete it until it is closed. - do_execute_soon(check_test_1); - }); -} - -function check_test_1() { - startupManager(1, false); - AddonManager.getAddonByID("addon1@tests.mozilla.org", function(a1) { do_check_neq(a1, null); do_check_eq(a1.version, "1.0"); @@ -64,6 +40,6 @@ function check_test_1() { do_check_true(db.exists()); do_check_true(db.fileSize > 0); - end_test(); + do_test_finished(); }); }