Backed out 2 changesets (bug 1565563, bug 1565315) for perma fails on test_validate_engines.js. CLOSED TREE

Backed out changeset 2bd7c693a493 (bug 1565315)
Backed out changeset 5de764b97e6c (bug 1565563)

browser/components/search/extensions/list.json

@@ -56,35 +56,6 @@
         "visibleDefaultEngines": [
           "google-b-d", "amazondotcom", "bing", "ddg", "ebay", "twitter", "wikipedia"
         ]
-      },
-      "KZ": {
-        "visibleDefaultEngines": [
-          "amazondotcom", "bing", "google", "twitter", "wikipedia", "ddg", "yandex-en"
-        ],
-        "searchDefault": "Yandex"
-      },
-      "BY": {
-        "visibleDefaultEngines": [
-          "amazondotcom", "bing", "google", "twitter", "wikipedia", "ddg", "yandex-en"
-        ],
-        "searchDefault": "Yandex"
-      },
-      "RU": {
-        "visibleDefaultEngines": [
-          "amazondotcom", "bing", "google", "twitter", "wikipedia", "ddg", "yandex-en"
-        ],
-        "searchDefault": "Yandex"
-      },
-      "TR": {
-        "visibleDefaultEngines": [
-          "amazondotcom", "bing", "google", "twitter", "wikipedia", "ddg", "yandex-en"
-        ],
-        "searchDefault": "Yandex"
-      },
-      "experimental-hidden": {
-        "visibleDefaultEngines": [
-          "amazon-ca", "amazon-au", "google-2018", "yandex-en", "google", "google-b-1-e", "google-b-e"
-        ]
       }
     },
     "ach": {
@@ -266,35 +237,6 @@
         "visibleDefaultEngines": [
           "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia"
         ]
-      },
-      "KZ": {
-        "visibleDefaultEngines": [
-          "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia"
-        ],
-        "searchDefault": "Yandex"
-      },
-      "BY": {
-        "visibleDefaultEngines": [
-          "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia"
-        ],
-        "searchDefault": "Yandex"
-      },
-      "RU": {
-        "visibleDefaultEngines": [
-          "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia"
-        ],
-        "searchDefault": "Yandex"
-      },
-      "TR": {
-        "visibleDefaultEngines": [
-          "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia"
-        ],
-        "searchDefault": "Yandex"
-      },
-      "experimental-hidden": {
-        "visibleDefaultEngines": [
-          "amazon-ca", "amazon-au", "google-2018", "yandex-en", "google", "google-b-1-e", "google-b-e"
-        ]
       }
     },
     "en-GB": {
@@ -302,35 +244,6 @@
         "visibleDefaultEngines": [
           "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia"
         ]
-      },
-      "KZ": {
-        "visibleDefaultEngines": [
-          "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia"
-        ],
-        "searchDefault": "Yandex"
-      },
-      "BY": {
-        "visibleDefaultEngines": [
-          "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia"
-        ],
-        "searchDefault": "Yandex"
-      },
-      "RU": {
-        "visibleDefaultEngines": [
-          "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia"
-        ],
-        "searchDefault": "Yandex"
-      },
-      "TR": {
-        "visibleDefaultEngines": [
-          "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia"
-        ],
-        "searchDefault": "Yandex"
-      },
-      "experimental-hidden": {
-        "visibleDefaultEngines": [
-          "yandex-en"
-        ]
       }
     },
     "en-ZA": {
@@ -338,30 +251,6 @@
         "visibleDefaultEngines": [
           "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia"
         ]
-      },
-      "KZ": {
-        "visibleDefaultEngines": [
-          "yandex-en", "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia"
-        ],
-        "searchDefault": "Yandex"
-      },
-      "BY": {
-        "visibleDefaultEngines": [
-          "yandex-en", "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia"
-        ],
-        "searchDefault": "Yandex"
-      },
-      "RU": {
-        "visibleDefaultEngines": [
-          "yandex-en", "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia"
-        ],
-        "searchDefault": "Yandex"
-      },
-      "TR": {
-        "visibleDefaultEngines": [
-          "yandex-en", "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia"
-        ],
-        "searchDefault": "Yandex"
       }
     },
     "eo": {
@@ -397,11 +286,6 @@
         "visibleDefaultEngines": [
           "google-b-d", "bing", "ddg", "mercadolibre-mx", "wikipedia-es"
         ]
-      },
-      "experimental-hidden": {
-        "visibleDefaultEngines": [
-          "amazon-mx"
-        ]
       }
     },
     "et": {
@@ -451,11 +335,6 @@
         "visibleDefaultEngines": [
           "google-b-d", "bing", "bolcom-fy-NL", "ddg", "ebay-nl", "marktplaats-fy-NL", "wikipedia-fy-NL"
         ]
-      },
-      "experimental-hidden": {
-        "visibleDefaultEngines": [
-          "amazon-nl"
-        ]
       }
     },
     "ga-IE": {
@@ -729,11 +608,6 @@
         "visibleDefaultEngines": [
           "google-b-d", "bing", "bolcom-nl", "ddg", "ebay-nl", "marktplaats-nl", "wikipedia-nl"
         ]
-      },
-      "experimental-hidden": {
-        "visibleDefaultEngines": [
-          "amazon-nl"
-        ]
       }
     },
     "nn-NO": {
@@ -776,11 +650,6 @@
         "visibleDefaultEngines": [
           "google-b-d", "bing", "ddg", "mercadolivre", "twitter", "wikipedia-pt"
         ]
-      },
-      "experimental-hidden": {
-        "visibleDefaultEngines": [
-          "amazon-br"
-        ]
       }
     },
     "pt-PT": {

toolkit/components/search/tests/xpcshell/searchconfigs/head_searchconfig.js

@@ -243,9 +243,7 @@ class SearchConfigTest {
     const data = await OS.File.read(do_get_file("all-locales").path, {
       encoding: "utf-8",
     });
-    // "en-US" is not in all-locales as it is the default locale
-    // add it manually to ensure it is tested.
-    return [...data.split("\n").filter(e => e != ""), "en-US"];
+    return data.split("\n").filter(e => e != "");
   }
 
   /**

toolkit/components/search/tests/xpcshell/searchconfigs/test_ebay.js

@@ -3,8 +3,6 @@
 
 "use strict";
 
-let availableRegions = Services.intl.getAvailableLocaleDisplayNames("region");
-
 const test = new SearchConfigTest({
   identifier: "ebay",
   aliases: ["@ebay"],
@@ -21,6 +19,7 @@ const test = new SearchConfigTest({
         locales: {
           matches: [
             "an",
+            "en-US",
             "ast",
             "br",
             "ca",
@@ -45,15 +44,6 @@ const test = new SearchConfigTest({
           ],
         },
       },
-      {
-        // For en-US ebay is currently included everywhere apart from these regions.
-        regions: availableRegions.filter(
-          region => !["by", "kz", "ru", "tr"].includes(region)
-        ),
-        locales: {
-          matches: ["en-US"],
-        },
-      },
     ],
   },
   searchUrlBase: "https://rover.ebay.com/rover/1/",
@@ -114,7 +104,7 @@ const test = new SearchConfigTest({
           locales: { matches: ["en-US"] },
         },
       ],
-      excluded: [{ regions: ["au", "be", "ca", "ch", "gb", "ie", "nl"] }],
+      excluded: [{ regions: ["au"] }],
       searchUrlEnd: "711-53200-19255-0/1",
     },
     {

toolkit/components/search/tests/xpcshell/searchconfigs/test_google.js

@@ -18,7 +18,8 @@ const test = new SearchConfigTest({
         regions: ["ru", "tr", "by", "kz"],
         locales: {
           matches: ["ru", "tr", "be", "kk"],
-          startsWith: ["en"],
+          // We don't currently enforce this.
+          // startsWith: ["en"],
         },
       },
       {

toolkit/components/search/tests/xpcshell/searchconfigs/test_yandex.js

@@ -12,7 +12,8 @@ const test = new SearchConfigTest({
         regions: ["ru", "tr", "by", "kz"],
         locales: {
           matches: ["ru", "tr", "be", "kk"],
-          startsWith: ["en"],
+          // We don't currently enforce this.
+          // startsWith: ["en"],
         },
       },
     ],
@@ -24,12 +25,6 @@ const test = new SearchConfigTest({
           matches: ["az", "ru", "be", "kk", "tr"],
         },
       },
-      {
-        regions: ["ru", "tr", "by", "kz"],
-        locales: {
-          startsWith: ["en"],
-        },
-      },
     ],
   },
   details: [