Bug 947565 - Remove custom timeout in packaged apps tests. r=fabrice, a=test-only
authorMarco Castelluccio <mar.castelluccio@studenti.unina.it>
Tue, 29 Apr 2014 04:02:00 -0400
changeset 192564 7f1fffe7cbcb9f5e19bb94125323623f3c2b6dfe
parent 192563 63f597d07af6f623dc632d7fb494b48bd960bd23
child 192565 331ceaa4b34e5b942efc509ad607f03ffb533591
push id5836
push userryanvm@gmail.com
push dateWed, 30 Apr 2014 13:06:38 +0000
treeherdermozilla-aurora@37b2d84d81de [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfabrice, test-only
bugs947565
milestone31.0a2
Bug 947565 - Remove custom timeout in packaged apps tests. r=fabrice, a=test-only
dom/apps/tests/test_packaged_app_common.js
--- a/dom/apps/tests/test_packaged_app_common.js
+++ b/dom/apps/tests/test_packaged_app_common.js
@@ -7,55 +7,39 @@ var PackagedTestHelper = (function Packa
 
   var steps;
   var index = -1;
   var gSJSPath = "tests/dom/apps/tests/file_packaged_app.sjs";
   var gSJS = "http://test/" + gSJSPath;
   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);
     }
   }
 
   function start() {
     next();
   }
 
   function finish() {
-    if (timeoutID) {
-      clearTimeout(timeoutID);
-    }
     SpecialPowers.removePermission("webapps-manage", document);
     SimpleTest.finish();
   }
 
   function mozAppsError() {
     ok(false, "mozApps error: " + this.error.name);
     finish();
   }