Bug 1451532 Remove/replace legacy extensions in telemetry tests r=gfritzsche
authorAndrew Swan <aswan@mozilla.com>
Mon, 22 Oct 2018 11:42:16 -0700
changeset 503583 f1a4ed8b794571fb9e8c3b7509b5aac5ec11282b
parent 503582 c5751a5efe5beaa4dc82089bc5ede81ee35f3291
child 503584 27ace8afa15d5379b503aaab800251adf1e90a4f
push id10290
push userffxbld-merge
push dateMon, 03 Dec 2018 16:23:23 +0000
treeherdermozilla-beta@700bed2445e6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgfritzsche
bugs1451532
milestone65.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 1451532 Remove/replace legacy extensions in telemetry tests r=gfritzsche
toolkit/components/telemetry/tests/addons/dictionary/install.rdf
toolkit/components/telemetry/tests/addons/dictionary/manifest.json
toolkit/components/telemetry/tests/addons/experiment/install.rdf
toolkit/components/telemetry/tests/addons/system/install.rdf
toolkit/components/telemetry/tests/addons/system/manifest.json
toolkit/components/telemetry/tests/addons/theme/install.rdf
toolkit/components/telemetry/tests/addons/theme/manifest.json
toolkit/components/telemetry/tests/unit/test_TelemetryEnvironment.js
toolkit/components/telemetry/tests/unit/xpcshell.ini
rename from toolkit/components/telemetry/tests/addons/dictionary/install.rdf
rename to toolkit/components/telemetry/tests/addons/dictionary/manifest.json
--- a/toolkit/components/telemetry/tests/addons/dictionary/install.rdf
+++ b/toolkit/components/telemetry/tests/addons/dictionary/manifest.json
@@ -1,25 +1,15 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
+{
+  "manifest_version": 2,
 
-  <Description about="urn:mozilla:install-manifest">
-    <em:id>telemetry-dictionary@tests.mozilla.org</em:id>
-    <em:version>1</em:version>
-    <em:type>64</em:type>
+  "name": "Telemetry test dictionary",
+  "description": "A nice dictionary to prevent all typos for Telemetry.",
+  "version": "1.0",
 
-    <em:targetApplication>
-      <Description>
-        <em:id>toolkit@mozilla.org</em:id>
-        <em:minVersion>0</em:minVersion>
-        <em:maxVersion>*</em:maxVersion>
-      </Description>
-    </em:targetApplication>
+  "dictionaries": {},
 
-    <!-- Front End MetaData -->
-    <em:name>Telemetry test dictionary</em:name>
-    <em:description>A nice dictionary to prevent all typos for Telemetry.</em:description>
-    <em:bootstrap>true</em:bootstrap>
-
-  </Description>
-</RDF>
+  "applications": {
+    "gecko": {
+      "id": "telemetry-dictionary@tests.mozilla.org"
+    }
+  }
+}
deleted file mode 100644
--- a/toolkit/components/telemetry/tests/addons/experiment/install.rdf
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
-  <Description about="urn:mozilla:install-manifest">
-    <em:id>telemetry-experiment-1@tests.mozilla.org</em:id>
-    <em:version>1</em:version>
-    <em:type>128</em:type>
-
-    <!-- Front End MetaData -->
-    <em:name>Telemetry test experiment</em:name>
-    <em:description>Yet another experiment that experiments experimentally.</em:description>
-
-  </Description>
-</RDF>
rename from toolkit/components/telemetry/tests/addons/system/install.rdf
rename to toolkit/components/telemetry/tests/addons/system/manifest.json
--- a/toolkit/components/telemetry/tests/addons/system/install.rdf
+++ b/toolkit/components/telemetry/tests/addons/system/manifest.json
@@ -1,25 +1,13 @@
-<?xml version="1.0"?>
+{
+  "manifest_version": 2,
 
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
-  <Description about="urn:mozilla:install-manifest">
-    <em:id>tel-system-xpi@tests.mozilla.org</em:id>
-    <em:version>1.0</em:version>
+  "name": "XPI Telemetry System Add-on Test",
+  "description": "A system addon which is shipped with Firefox.",
+  "version": "1.0",
 
-    <em:targetApplication>
-      <Description>
-        <em:id>toolkit@mozilla.org</em:id>
-        <em:minVersion>0</em:minVersion>
-        <em:maxVersion>*</em:maxVersion>
-      </Description>
-    </em:targetApplication>
-
-    <!-- Front End MetaData -->
-    <em:name>XPI Telemetry System Add-on Test</em:name>
-    <em:description>A system addon which is shipped with Firefox.</em:description>
-    <em:bootstrap>true</em:bootstrap>
-    <em:multiprocessCompatible>true</em:multiprocessCompatible>
-
-  </Description>
-</RDF>
+  "applications": {
+    "gecko": {
+      "id": "tel-system-xpi@tests.mozilla.org"
+    }
+  }
+}
rename from toolkit/components/telemetry/tests/addons/theme/install.rdf
rename to toolkit/components/telemetry/tests/addons/theme/manifest.json
--- a/toolkit/components/telemetry/tests/addons/theme/install.rdf
+++ b/toolkit/components/telemetry/tests/addons/theme/manifest.json
@@ -1,16 +1,19 @@
-<?xml version="1.0"?>
+{
+  "manifest_version": 2,
 
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
+  "name": "Telemetry test theme",
+  "description": "A good looking test theme for Telemetry.",
+  "version": "1.0",
 
-  <Description about="urn:mozilla:install-manifest">
-    <em:id>telemetry-theme@tests.mozilla.org</em:id>
-    <em:version>1</em:version>
-    <em:type>4</em:type>
+  "theme": {
+    "images": {
+      "headerURL": "foo.png"
+    }
+  }
 
-    <!-- Front End MetaData -->
-    <em:name>Telemetry test theme</em:name>
-    <em:description>A good looking test theme for Telemetry.</em:description>
-
-  </Description>
-</RDF>
+  "applications": {
+    "gecko": {
+      "id": "telemetry-theme@tests.mozilla.org"
+    }
+  }
+}
--- a/toolkit/components/telemetry/tests/unit/test_TelemetryEnvironment.js
+++ b/toolkit/components/telemetry/tests/unit/test_TelemetryEnvironment.js
@@ -1233,17 +1233,17 @@ add_task(async function test_addonsAndPl
     scope: 1,
     type: "extension",
     foreignInstall: false,
     hasBinaryComponents: false,
     installDay: truncateToDays(SYSTEM_ADDON_INSTALL_DATE),
     updateDay: truncateToDays(SYSTEM_ADDON_INSTALL_DATE),
     signedState: undefined,
     isSystem: true,
-    isWebExtension: false,
+    isWebExtension: true,
     multiprocessCompatible: true,
   };
 
   const WEBEXTENSION_ADDON_ID = "tel-webextension-xpi@tests.mozilla.org";
   const WEBEXTENSION_ADDON_INSTALL_DATE = truncateToDays(Date.now());
   const EXPECTED_WEBEXTENSION_ADDON_DATA = {
     blocklisted: false,
     description: "A webextension addon.",
--- a/toolkit/components/telemetry/tests/unit/xpcshell.ini
+++ b/toolkit/components/telemetry/tests/unit/xpcshell.ini
@@ -2,28 +2,26 @@
 head = head.js
 firefox-appdir = browser
 # The *.xpi files are only needed for test_TelemetryEnvironment.js, but
 # xpcshell fails to install tests if we move them under the test entry.
 support-files =
   ../search/chrome.manifest
   ../search/searchTest.jar
   dictionary.xpi
-  experiment.xpi
   engine.xml
   system.xpi
   restartless.xpi
   testUnicodePDB32.dll
   testNoPDB32.dll
   testUnicodePDB64.dll
   testNoPDB64.dll
   !/toolkit/mozapps/extensions/test/xpcshell/head_addons.js
 generated-files =
   dictionary.xpi
-  experiment.xpi
   system.xpi
   restartless.xpi
 
 [test_GeckoView.js]
 skip-if = os == "android" # Disabled due to crashes (see bug 1331366)
 head = head_GeckoView.js
 support-files =
   test_GeckoView_content_histograms.js