bug 1373367: prefix values in SYSTEM_CAPABILITIES field. r=rstrong
authorBen Hearsum <bhearsum@mozilla.com>
Mon, 24 Jul 2017 09:05:47 -0400
changeset 419299 57164b11328641c6ad9f89ca6a941418b474d99a
parent 419298 882a43e7e21ab3d595f01dbb344fcff870d1e5d4
child 419300 b8d5c1d7bf82ad052da3e846f8882f04b53a40c9
push id7566
push usermtabara@mozilla.com
push dateWed, 02 Aug 2017 08:25:16 +0000
treeherdermozilla-beta@86913f512c3c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrstrong
bugs1373367
milestone56.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
bug 1373367: prefix values in SYSTEM_CAPABILITIES field. r=rstrong
toolkit/modules/UpdateUtils.jsm
toolkit/modules/tests/xpcshell/test_UpdateUtils_url.js
--- a/toolkit/modules/UpdateUtils.jsm
+++ b/toolkit/modules/UpdateUtils.jsm
@@ -130,17 +130,17 @@ this.UpdateUtils = {
 };
 
 /* Get the distribution pref values, from defaults only */
 function getDistributionPrefValue(aPrefName) {
   return Services.prefs.getDefaultBranch(null).getCharPref(aPrefName, "default");
 }
 
 function getSystemCapabilities() {
-  return gInstructionSet + "," + getMemoryMB();
+  return "ISET:" + gInstructionSet + ",MEM:" + getMemoryMB();
 }
 
 /**
  * Gets the RAM size in megabytes. This will round the value because sysinfo
  * doesn't always provide RAM in multiples of 1024.
  */
 function getMemoryMB() {
   let memoryMB = "unknown";
--- a/toolkit/modules/tests/xpcshell/test_UpdateUtils_url.js
+++ b/toolkit/modules/tests/xpcshell/test_UpdateUtils_url.js
@@ -340,12 +340,12 @@ add_task(async function test_custom() {
   let url = URL_PREFIX + "%CUSTOM%/";
   Assert.equal(await getResult(url), "custom",
                "the url query string for %CUSTOM%" + MSG_SHOULD_EQUAL);
 });
 
 // url constructed with %SYSTEM_CAPABILITIES%
 add_task(async function test_systemCapabilities() {
   let url = URL_PREFIX + "%SYSTEM_CAPABILITIES%/";
-  let systemCapabilities = getInstructionSet() + "," + getMemoryMB();
+  let systemCapabilities = "ISET:" + getInstructionSet() + ",MEM:" + getMemoryMB();
   Assert.equal(await getResult(url), systemCapabilities,
                "the url param for %SYSTEM_CAPABILITIES%" + MSG_SHOULD_EQUAL);
 });