Bug 711692 - Append TEST_ID to app_console_log. r=bbondy.
authorRobert Strong <rstrong@mozilla.com>
Wed, 04 Jan 2012 23:19:17 -0500
changeset 85007 9d47544d1abadbe1f99615eb22b070abdd66abc8
parent 85006 e805d90954b7293c788f0ef008bfc6104a7cfc60
child 85008 dabd7c594ea9eb7b0adf994e19edf1ae9a21f55a
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)
reviewersbbondy
bugs711692
milestone12.0a1
Bug 711692 - Append TEST_ID to app_console_log. r=bbondy.
toolkit/mozapps/update/test/unit/head_update.js.in
toolkit/mozapps/update/test/unit/test_0200_app_launch_apply_update.js
toolkit/mozapps/update/test_svc/unit/test_0200_app_launch_apply_update_svc.js
--- a/toolkit/mozapps/update/test/unit/head_update.js.in
+++ b/toolkit/mozapps/update/test/unit/head_update.js.in
@@ -1479,17 +1479,17 @@ function getProcessArgs(aExtraArgs) {
 /**
  * Gets a file path for piping the console output from the application so it
  * doesn't appear in the xpcshell log file.
  *
  * @return  path to the file for piping the console output from the application.
  */
 function getAppConsoleLogPath() {
   let appConsoleLog = do_get_file("/", true);
-  appConsoleLog.append("app_console_log");
+  appConsoleLog.append(TEST_ID + "_app_console_log");
   if (appConsoleLog.exists()) {
     appConsoleLog.remove(false);
   }
   let appConsoleLogPath = appConsoleLog.path;
   if (/ /.test(appConsoleLogPath)) {
     appConsoleLogPath = '"' + appConsoleLogPath + '"';
   }
   return appConsoleLogPath;
--- a/toolkit/mozapps/update/test/unit/test_0200_app_launch_apply_update.js
+++ b/toolkit/mozapps/update/test/unit/test_0200_app_launch_apply_update.js
@@ -4,16 +4,18 @@
 
 /* Test applying an update by staging an update and launching an application */
 
 /**
  * The MAR file used for this test should not contain a version 2 update
  * manifest file (e.g. updatev2.manifest).
  */
 
+const TEST_ID = "0200";
+
 // Backup the updater.ini and use a custom one to prevent the updater from
 // launching a post update executable.
 const FILE_UPDATER_INI_BAK = "updater.ini.bak";
 
 // Number of milliseconds for each do_timeout call.
 const CHECK_TIMEOUT_MILLI = 1000;
 
 // Maximum number of milliseconds the process that is launched can run before
--- a/toolkit/mozapps/update/test_svc/unit/test_0200_app_launch_apply_update_svc.js
+++ b/toolkit/mozapps/update/test_svc/unit/test_0200_app_launch_apply_update_svc.js
@@ -4,16 +4,18 @@
 
 /* Test applying an update by staging an update and launching an application */
 
 /**
  * The MAR file used for this test should not contain a version 2 update
  * manifest file (e.g. updatev2.manifest).
  */
 
+const TEST_ID = "0200_svc";
+
 // Backup the updater.ini and use a custom one to prevent the updater from
 // launching a post update executable.
 const FILE_UPDATER_INI_BAK = "updater.ini.bak";
 
 // Number of milliseconds for each do_timeout call.
 const CHECK_TIMEOUT_MILLI = 1000;
 
 // Maximum number of milliseconds the process that is launched can run before