Bug 711692 - Cleanup tests. r=rstrong.
authorBrian R. Bondy <netzen@gmail.com>
Wed, 04 Jan 2012 23:19:18 -0500
changeset 85015 44ba65ab3eb5ba8d58f8340360cec1bb38d013e8
parent 85014 a3578e0c0a5184764a207f9bda61e59b1186385c
child 85016 5c67bc43f94d8e67e55c00c5331bf2850ec3c5ae
push id805
push userakeybl@mozilla.com
push dateWed, 01 Feb 2012 18:17:35 +0000
treeherdermozilla-aurora@6fb3bf232436 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrstrong
bugs711692
milestone12.0a1
Bug 711692 - Cleanup tests. r=rstrong.
toolkit/mozapps/update/test_svc/unit/test_0000_bootstrap_svc.js
toolkit/mozapps/update/test_svc/unit/test_0110_general_svc.js
--- a/toolkit/mozapps/update/test_svc/unit/test_0000_bootstrap_svc.js
+++ b/toolkit/mozapps/update/test_svc/unit/test_0000_bootstrap_svc.js
@@ -25,19 +25,16 @@ function run_test() {
     return;
   }
 
   do_test_pending();
   do_register_cleanup(cleanupUpdaterTest);
 
   setupUpdaterTest(MAR_COMPLETE_FILE);
 
-  let updatesDir = do_get_file(TEST_ID + UPDATES_DIR_SUFFIX);
-  let applyToDir = getApplyDirFile();
-
   // apply the complete mar
   runUpdateUsingService(STATE_PENDING_SVC, STATE_SUCCEEDED, checkUpdateApplied, null, false);
 }
 
 function checkUpdateApplied() {
   checkFilesAfterUpdateSuccess();
 
   // We need to check the service log even though this is a bootstrap
--- a/toolkit/mozapps/update/test_svc/unit/test_0110_general_svc.js
+++ b/toolkit/mozapps/update/test_svc/unit/test_0110_general_svc.js
@@ -273,18 +273,16 @@ function run_test() {
     return;
   }
 
   do_test_pending();
   do_register_cleanup(cleanupUpdaterTest);
 
   setupUpdaterTest(MAR_COMPLETE_FILE);
 
-  let updatesDir = do_get_file(TEST_ID + UPDATES_DIR_SUFFIX);
-
   // apply the complete mar
   runUpdateUsingService(STATE_PENDING_SVC, STATE_SUCCEEDED, checkUpdateApplied);
 }
 
 function checkUpdateApplied() {
   logTestInfo("testing update.status should be " + STATE_SUCCEEDED);
   let updatesDir = do_get_file(TEST_ID + UPDATES_DIR_SUFFIX);
   do_check_eq(readStatusFile(updatesDir), STATE_SUCCEEDED);