Bug 1619824 - Remove more prefs disabling the OS X address book in tests. r=mkmelin DONTBUILD
authorGeoff Lankow <geoff@darktrojan.net>
Mon, 09 Mar 2020 20:19:16 +1300
changeset 37521 f87a75425b97da24ec0314009e7d18e08dbfffc1
parent 37520 2679ad2daf985416a6c7956b59dfdc15d6b11f68
child 37522 b2cecde80ad8695cceff07444170b67ca9780cdf
push id2566
push userclokep@gmail.com
push dateMon, 09 Mar 2020 19:20:31 +0000
treeherdercomm-beta@a352facfa0a4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmkmelin
bugs1619824
Bug 1619824 - Remove more prefs disabling the OS X address book in tests. r=mkmelin DONTBUILD
mail/components/extensions/test/xpcshell/head.js
testing/marionette/thunderbirdinstance.py
--- a/mail/components/extensions/test/xpcshell/head.js
+++ b/mail/components/extensions/test/xpcshell/head.js
@@ -12,25 +12,16 @@ ChromeUtils.defineModuleGetter(
   "MailServices",
   "resource:///modules/MailServices.jsm"
 );
 
 var { AddonTestUtils } = ChromeUtils.import(
   "resource://testing-common/AddonTestUtils.jsm"
 );
 
-// Ensure the profile directory is set up
-do_get_profile();
-
-// Windows (Outlook Express) Address Book deactivation. (Bug 448859)
-Services.prefs.deleteBranch("ldap_2.servers.oe.");
-
-// OSX Address Book deactivation (Bug 955842)
-Services.prefs.deleteBranch("ldap_2.servers.osx.");
-
 var createHttpServer = (...args) => {
   AddonTestUtils.maybeInit(this);
   return AddonTestUtils.createHttpServer(...args);
 };
 
 function createAccount() {
   MailServices.accounts.createLocalMailAccount();
   let account = MailServices.accounts.accounts[0];
--- a/testing/marionette/thunderbirdinstance.py
+++ b/testing/marionette/thunderbirdinstance.py
@@ -25,14 +25,9 @@ thunderbird_prefs = {
     # Do not start first-run items
     "mail.provider.suppress_dialog_on_startup": True,
     "mail.spotlight.firstRunDone": True,
     "mail.winsearch.firstRunDone": True,
 
     # Do not open start page
     "mailnews.start_page.override_url": "about:blank",
     "mailnews.start_page.url": "about:blank",
-
-    # Fix MacOS startup by disabling Mac address book integration.
-    "ldap_2.servers.osx.description": "",
-    "ldap_2.servers.osx.dirType": -1,
-    "ldap_2.servers.osx.uri": "",
 }