Bug 641212 - use lzma compression for application update. Part 3 - test changes to support the new test mar file size and additional logging. r=mhowell, a=lizzard
authorRobert Strong <robert.bugzilla@gmail.com>
Sun, 30 Jul 2017 23:27:05 -0700
changeset 423573 b51545b93e3b4e2ededcfbadc1b529b3a62083b3
parent 423572 841c1a6eaa9c40b2455ace84eb9d328a99bc74f8
child 423574 5f9d8dc3963108a1c8b6ba835f4213fa02e2cb42
push id1517
push userjlorenzo@mozilla.com
push dateThu, 14 Sep 2017 16:50:54 +0000
treeherdermozilla-release@3b41fd564418 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmhowell, lizzard
bugs641212
milestone56.0
Bug 641212 - use lzma compression for application update. Part 3 - test changes to support the new test mar file size and additional logging. r=mhowell, a=lizzard
modules/libmar/tests/unit/head_libmar.js
toolkit/mozapps/update/tests/data/sharedUpdateXML.js
--- a/modules/libmar/tests/unit/head_libmar.js
+++ b/modules/libmar/tests/unit/head_libmar.js
@@ -109,17 +109,17 @@ function createMAR(outMAR, dataDir, file
     f.permissions = 0o664;
   }
 
   // Setup the command line arguments to create the MAR.
   let args = ["-C", dataDir.path, "-H", "\@MAR_CHANNEL_ID\@",
               "-V", "13.0a1", "-c", outMAR.path];
   args = args.concat(files);
 
-  do_print('Running: ' + signmarBin.path);
+  do_print('Running: ' + signmarBin.path + " " + args.join(" "));
   process.init(signmarBin);
   process.run(true, args, args.length);
 
   // Verify signmar returned 0 for success.
   do_check_eq(process.exitValue, 0);
 
   // Verify the out MAR file actually exists.
   do_check_true(outMAR.exists());
@@ -139,15 +139,15 @@ function extractMAR(mar, dataDir) {
 
   // Make sure the signmar binary exists and is an executable.
   do_check_true(signmarBin.exists());
   do_check_true(signmarBin.isExecutable());
 
   // Setup the command line arguments to create the MAR.
   let args = ["-C", dataDir.path, "-x", mar.path];
 
-  do_print('Running: ' + signmarBin.path);
+  do_print('Running: ' + signmarBin.path + " " + args.join(" "));
   process.init(signmarBin);
   process.run(true, args, args.length);
 
   // Verify signmar returned 0 for success.
   do_check_eq(process.exitValue, 0);
 }
--- a/toolkit/mozapps/update/tests/data/sharedUpdateXML.js
+++ b/toolkit/mozapps/update/tests/data/sharedUpdateXML.js
@@ -9,17 +9,17 @@
  * by the updates.sjs file used by the mochitest-chrome tests. Since xpcshell
  * used by the http server is launched with -v 170 this file must not use
  * features greater than JavaScript 1.7.
  */
 
 /* eslint-disable no-undef */
 
 const FILE_SIMPLE_MAR = "simple.mar";
-const SIZE_SIMPLE_MAR = "1031";
+const SIZE_SIMPLE_MAR = "1148";
 
 const STATE_NONE            = "null";
 const STATE_DOWNLOADING     = "downloading";
 const STATE_PENDING         = "pending";
 const STATE_PENDING_SVC     = "pending-service";
 const STATE_APPLYING        = "applying";
 const STATE_APPLIED         = "applied";
 const STATE_APPLIED_SVC     = "applied-service";