Bug 1633931 - Fix and re-enable WebExtensions tests on Thunderbird. r=mixedpuppy

Differential Revision: https://phabricator.services.mozilla.com/D72972

toolkit/components/extensions/test/xpcshell/test_ext_background_telemetry.js

@@ -6,6 +6,11 @@ const HISTOGRAM = "WEBEXT_BACKGROUND_PAGE_LOAD_MS";
 const HISTOGRAM_KEYED = "WEBEXT_BACKGROUND_PAGE_LOAD_MS_BY_ADDONID";
 
 add_task(async function test_telemetry() {
+  Services.prefs.setBoolPref(
+    "toolkit.telemetry.testing.overrideProductsCheck",
+    true
+  );
+
   let extension1 = ExtensionTestUtils.loadExtension({
     background() {
       browser.test.sendMessage("loaded");

toolkit/components/extensions/test/xpcshell/test_ext_experiments.js

@@ -168,7 +168,7 @@ add_task(async function test_bundled_experiments() {
     {
       isPrivileged: false,
       temporarilyInstalled: false,
-      shouldHaveExperiments: false,
+      shouldHaveExperiments: AppConstants.MOZ_APP_NAME == "thunderbird",
     },
   ];
 

toolkit/components/extensions/test/xpcshell/test_ext_extension_content_telemetry.js

@@ -15,6 +15,11 @@ add_task(async function test_telemetry() {
     browser.test.sendMessage("content-script-run");
   }
 
+  Services.prefs.setBoolPref(
+    "toolkit.telemetry.testing.overrideProductsCheck",
+    true
+  );
+
   let extension1 = ExtensionTestUtils.loadExtension({
     manifest: {
       content_scripts: [

toolkit/components/extensions/test/xpcshell/test_ext_extension_startup_telemetry.js

@@ -18,6 +18,11 @@ function processKeyedSnapshot(snapshot) {
 }
 
 add_task(async function test_telemetry() {
+  Services.prefs.setBoolPref(
+    "toolkit.telemetry.testing.overrideProductsCheck",
+    true
+  );
+
   let extension1 = ExtensionTestUtils.loadExtension({});
   let extension2 = ExtensionTestUtils.loadExtension({});
 

toolkit/components/extensions/test/xpcshell/test_ext_startup_perf.js

@@ -24,6 +24,10 @@ if (!Services.prefs.getBoolPref("extensions.webextensions.remote")) {
   );
 }
 
+if (AppConstants.MOZ_APP_NAME == "thunderbird") {
+  STARTUP_MODULES.push("resource://gre/modules/ExtensionContent.jsm");
+}
+
 AddonTestUtils.init(this);
 
 // Tests that only the minimal set of API scripts and modules are loaded at

toolkit/components/extensions/test/xpcshell/test_ext_storage_telemetry.js

@@ -263,6 +263,11 @@ async function test_telemetry_background() {
 }
 
 add_task(async function setup() {
+  Services.prefs.setBoolPref(
+    "toolkit.telemetry.testing.overrideProductsCheck",
+    true
+  );
+
   // Telemetry test setup needed to ensure that the builtin events are defined
   // and they can be collected and verified.
   await TelemetryController.testSetup();

toolkit/components/extensions/test/xpcshell/test_ext_userScripts_telemetry.js

@@ -39,6 +39,11 @@ add_task(async function test_userScripts_telemetry() {
     browser.test.sendMessage("userScript-registered");
   }
 
+  Services.prefs.setBoolPref(
+    "toolkit.telemetry.testing.overrideProductsCheck",
+    true
+  );
+
   let testExtensionDef = {
     manifest: {
       permissions: ["http://*/*/file_sample.html"],

toolkit/components/extensions/test/xpcshell/xpcshell-common.ini

@@ -25,14 +25,16 @@ skip-if = os == "android"
 skip-if = appname == "thunderbird" || os == "android"
 [test_ext_captivePortal.js]
 # As with test_captive_portal_service.js, we use the same limits here.
-skip-if = os == "android" || (os == "mac" && debug) # CP service is disabled on Android, macosx1014/debug due to 1564534
+skip-if = appname == "thunderbird" || os == "android" || (os == "mac" && debug) # CP service is disabled on Android, macosx1014/debug due to 1564534
 run-sequentially = node server exceptions dont replay well
 [test_ext_captivePortal_url.js]
 # As with test_captive_portal_service.js, we use the same limits here.
-skip-if = os == "android" || (os == "mac" && debug) # CP service is disabled on Android, macosx1014/debug due to 1564534
+skip-if = appname == "thunderbird" || os == "android" || (os == "mac" && debug) # CP service is disabled on Android, macosx1014/debug due to 1564534
 run-sequentially = node server exceptions dont replay well
 [test_ext_cookieBehaviors.js]
+skip-if = appname == "thunderbird"
 [test_ext_cookies_firstParty.js]
+skip-if = appname == "thunderbird"
 [test_ext_cookies_samesite.js]
 [test_ext_content_security_policy.js]
 skip-if = (os == "win" && debug) #Bug 1485567
@@ -69,7 +71,6 @@ skip-if = appname == "thunderbird" || os == "android"
 [test_ext_error_location.js]
 [test_ext_eventpage_warning.js]
 [test_ext_experiments.js]
-fail-if = appname == "thunderbird"
 [test_ext_extension.js]
 [test_ext_extensionPreferencesManager.js]
 [test_ext_extensionSettingsStore.js]
@@ -82,6 +83,7 @@ skip-if = os == "android" || tsan # Not shipped on Android. tsan: bug 1612707
 [test_ext_geturl.js]
 [test_ext_idle.js]
 [test_ext_incognito.js]
+skip-if = appname == "thunderbird"
 [test_ext_l10n.js]
 [test_ext_localStorage.js]
 [test_ext_management.js]
@@ -91,6 +93,7 @@ skip-if = (os == "win" && !debug) #Bug 1419183 disable on Windows
 skip-if = appname == "thunderbird" || (os == "android" && debug)
 [test_ext_networkStatus.js]
 [test_ext_notifications_incognito.js]
+skip-if = appname == "thunderbird"
 [test_ext_notifications_unsupported.js]
 [test_ext_onmessage_removelistener.js]
 skip-if = true # This test no longer tests what it is meant to test.
@@ -140,7 +143,7 @@ skip-if = os == "android"
 [test_ext_storage.js]
 skip-if = os == "android" && debug
 [test_ext_storage_idb_data_migration.js]
-skip-if = os == "android" && debug
+skip-if = appname == "thunderbird" || (os == "android" && debug)
 [test_ext_storage_content.js]
 skip-if = os == "android" && debug
 [test_ext_storage_quota_exceeded_errors.js]
@@ -148,8 +151,9 @@ skip-if = os == "android" # Bug 1564871
 [test_ext_storage_managed.js]
 skip-if = os == "android"
 [test_ext_storage_managed_policy.js]
-skip-if = os == "android"
+skip-if = appname == "thunderbird" || os == "android"
 [test_ext_storage_sanitizer.js]
+skip-if = appname == "thunderbird"
 [test_ext_storage_sync.js]
 head = head.js head_sync.js
 skip-if = appname == "thunderbird" || os == "android"
@@ -207,6 +211,7 @@ skip-if = appname == "thunderbird" || os == "android" # Bug 1350559
 [test_ext_permissions_uninstall.js]
 skip-if = appname == "thunderbird" || os == "android" # Bug 1350559
 [test_proxy_listener.js]
+skip-if = appname == "thunderbird"
 [test_proxy_incognito.js]
 skip-if = os == "android" # incognito not supported on android
 [test_proxy_info_results.js]

toolkit/components/extensions/test/xpcshell/xpcshell.ini

@@ -83,6 +83,6 @@ skip-if = os == 'android' && processor == 'x86_64'
 skip-if = os == 'android' && processor == 'x86_64'
 
 [include:xpcshell-common.ini]
-skip-if = os != 'android' || (os == 'android' && processor == 'x86_64') # only android is left without e10s
+run-if = appname == "thunderbird" || (os == 'android' && processor != 'x86_64') # Thunderbird and Android have no e10s
 [include:xpcshell-content.ini]
-skip-if = os != 'android' || (os == 'android' && processor == 'x86_64') # only android is left without e10s
+run-if = appname == "thunderbird" || (os == 'android' && processor != 'x86_64') # Thunderbird and Android have no e10s