Bug 1604929 - Remove engineName from test engines.json files since the parameter was removed in bug 1592209. r=mikedeboer
authorMark Banner <standard8@mozilla.com>
Thu, 19 Dec 2019 21:57:43 +0000
changeset 507933 c1b33298b2579d1138eaa34349c57c9b56ad4d1e
parent 507932 67971490febd58dce90828ea27579340d424a6c4
child 507934 f14ef3dcca4ab1a5225ce6e4e787e6ad4d34d876
push id36933
push useraciure@mozilla.com
push dateFri, 20 Dec 2019 04:15:17 +0000
treeherdermozilla-central@c8ce8b91465a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmikedeboer
bugs1604929, 1592209
milestone73.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 1604929 - Remove engineName from test engines.json files since the parameter was removed in bug 1592209. r=mikedeboer Differential Revision: https://phabricator.services.mozilla.com/D57681
toolkit/components/search/tests/xpcshell/data/engines.json
toolkit/components/search/tests/xpcshell/data1/engines.json
toolkit/components/search/tests/xpcshell/simple-engines/engines.json
toolkit/components/search/tests/xpcshell/test-extensions/engines.json
--- a/toolkit/components/search/tests/xpcshell/data/engines.json
+++ b/toolkit/components/search/tests/xpcshell/data/engines.json
@@ -1,82 +1,76 @@
 {
   "data": [
     {
-      "engineName": "engine",
       "webExtension": {
         "id": "engine@search.mozilla.org",
         "version": "1.0"
       },
       "orderHint": 10000,
       "appliesTo": [{
         "included": { "everywhere": true },
         "default": "yes"
       }]
     },
     {
-      "engineName": "engine-pref",
       "webExtension": {
         "id": "engine-pref@search.mozilla.org",
         "version": "1.0"
       },
       "orderHint": 7000,
       "appliesTo": [{
         "included": { "everywhere": true },
         "excluded": { "locales": { "matches": ["de"] } },
         "default": "no",
         "defaultPrivate": "yes"
       }]
     },
     {
-      "engineName": "engine-rel-searchform-purpose",
       "webExtension": {
         "id": "engine-rel-searchform-purpose@search.mozilla.org",
         "version": "1.0"
       },
       "orderHint": 6000,
       "appliesTo": [{
         "included": { "everywhere": true },
         "excluded": { "locales": { "matches": ["de", "fr"] } },
         "default": "no"
       }]
     },
     {
-      "engineName": "engine-chromeicon",
       "webExtension": {
         "id": "engine-chromeicon@search.mozilla.org",
         "version": "1.0"
       },
       "orderHint": 8000,
       "appliesTo": [{
         "included": { "everywhere": true },
         "excluded": { "locales": { "matches": ["de", "fr"] } },
         "default": "no"
       }, {
         "included": { "regions": ["ru"] },
         "default": "no"
       }]
     },
     {
-      "engineName": "engine-resourceicon",
       "webExtension": {
         "id": "engine-resourceicon@search.mozilla.org",
         "version": "1.0"
       },
       "orderHint": 9000,
       "appliesTo": [{
         "included": { "locales": { "matches": ["en-US", "fr"] } },
         "excluded": {
           "regions": ["ru"]
         },
         "default": "no"
       }]
     },
     {
-      "engineName": "engine-reordered",
       "webExtension": {
         "id": "engine-reordered@search.mozilla.org",
         "version": "1.0"
       },
       "orderHint": 5000,
       "appliesTo": [{
         "included": { "everywhere": true },
         "excluded": { "locales": { "matches": ["de", "fr"] } },
--- a/toolkit/components/search/tests/xpcshell/data1/engines.json
+++ b/toolkit/components/search/tests/xpcshell/data1/engines.json
@@ -1,24 +1,22 @@
 {
   "data": [
     {
-      "engineName": "engine1",
       "webExtension": {
         "id": "engine1@search.mozilla.org",
         "version": "1.0"
       },
       "orderHint": 10000,
       "appliesTo": [{
         "included": { "everywhere": true },
         "default": "yes"
       }]
     },
     {
-      "engineName": "engine2",
       "webExtension": {
         "id": "engine2@search.mozilla.org",
         "version": "1.0"
       },
       "orderHint": 7000,
       "appliesTo": [{
         "included": { "everywhere": true },
         "default": "no"
--- a/toolkit/components/search/tests/xpcshell/simple-engines/engines.json
+++ b/toolkit/components/search/tests/xpcshell/simple-engines/engines.json
@@ -1,12 +1,11 @@
 {
   "data": [
     {
-      "engineName": "basic",
       "webExtension": {
         "id":"basic@search.mozilla.org",
         "version": "1.0"
       },
       "appliesTo": [{
         "included": { "everywhere": true },
         "default": "yes"
       }]
--- a/toolkit/components/search/tests/xpcshell/test-extensions/engines.json
+++ b/toolkit/components/search/tests/xpcshell/test-extensions/engines.json
@@ -1,35 +1,32 @@
 {
   "data": [
     {
-      "engineName": "plainengine",
       "webExtension": {
         "id": "plainengine@search.mozilla.org",
         "version": "1.0"
       },
       "orderHint": 10000,
       "appliesTo": [{
         "included": { "everywhere": true },
         "default": "yes"
       }]
     },
     {
-      "engineName": "special-engine",
       "webExtension": {
         "id": "special-engine@search.mozilla.org",
         "version": "1.0"
       },
       "orderHint": 7000,
       "appliesTo": [{
         "included": { "everywhere": true }
       }]
     },
     {
-      "engineName": "multilocale-an",
       "webExtension": {
         "id": "multilocale@search.mozilla.org",
         "version": "1.0",
         "locales": ["an"]
       },
       "orderHint": 6000,
       "appliesTo": [{
         "included": { "regions": ["an"] }