Bug 1291985 - Remove failing check from tests that run in parallel. r=mhowell, a=tests
authorRobert Strong <robert.bugzilla@gmail.com>
Mon, 22 Aug 2016 12:49:04 -0700
changeset 349863 07189ee916253fe9692528551ad1b96bc6c1bccc
parent 349862 89e811fde1ac900bdd55b071d3d397dc80afb31d
child 349864 36fd886d42c158fb2c613681c938960dfccda74b
push id1230
push userjlund@mozilla.com
push dateMon, 31 Oct 2016 18:13:35 +0000
treeherdermozilla-release@5e06e3766db2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmhowell, tests
bugs1291985
milestone50.0a2
Bug 1291985 - Remove failing check from tests that run in parallel. r=mhowell, a=tests
toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js
--- a/toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js
+++ b/toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js
@@ -3555,25 +3555,16 @@ function checkCallbackServiceLog() {
 
   waitForFilesInUse();
 }
 
 // Waits until files that are in use that break tests are no longer in use and
 // then calls doTestFinish to end the test.
 function waitForFilesInUse() {
   if (IS_WIN) {
-    if (isProcessRunning(FILE_UPDATER_BIN)) {
-      do_execute_soon(waitForFilesInUse);
-      return;
-    }
-    if (isProcessRunning(FILE_MAINTENANCE_SERVICE_INSTALLER_BIN)) {
-      do_execute_soon(waitForFilesInUse);
-      return;
-    }
-
     let appBin = getApplyDirFile(FILE_APP_BIN, true);
     let maintSvcInstaller = getApplyDirFile(FILE_MAINTENANCE_SERVICE_INSTALLER_BIN, true);
     let helper = getApplyDirFile("uninstall/helper.exe", true);
     let updater = getApplyDirFile(FILE_UPDATER_BIN, true);
     let files = [appBin, updater, maintSvcInstaller, helper];
 
     for (let i = 0; i < files.length; ++i) {
       let file = files[i];