diff --git a/dom/apps/tests/test_packaged_app_common.js b/dom/apps/tests/test_packaged_app_common.js index fb4bfeca997..9a0bddbff4c 100644 --- a/dom/apps/tests/test_packaged_app_common.js +++ b/dom/apps/tests/test_packaged_app_common.js @@ -12,31 +12,18 @@ var PackagedTestHelper = (function PackagedTestHelper() { var gAppName = "appname"; var gApp = null; var gInstallOrigin = "http://mochi.test:8888"; - var timeoutID; - - function timeoutError() { - ok(false, "Timeout! Probably waiting on a app installation event"); - info("Finishing this test suite!"); - finish(); - } function debug(aMsg) { //dump("== PackageTestHelper debug == " + aMsg + "\n"); } function next() { - if (timeoutID) { - clearTimeout(timeoutID); - } index += 1; if (index >= steps.length) { ok(false, "Shouldn't get here!"); return; } try { - // There's nothing here that should take more than 30 seconds, even on - // heavy loads. So there's no need to stop further tests for five minutes. - timeoutID = setTimeout(timeoutError, 30000); steps[index](); } catch(ex) { ok(false, "Caught exception", ex); @@ -48,9 +35,6 @@ var PackagedTestHelper = (function PackagedTestHelper() { } function finish() { - if (timeoutID) { - clearTimeout(timeoutID); - } SpecialPowers.removePermission("webapps-manage", document); SpecialPowers.removePermission("browser", document); SimpleTest.finish();