Bug 1569118 - Fix marionette startup on MacOS r=rjl draft macos_dummy_account
authorSamuel Thibault <samuel.thibault@ens-lyon.org>
Mon, 19 Aug 2019 14:34:34 +0200
branchmacos_dummy_account
changeset 77561 361b9420beecd7d26738f4e7b057968c4ae2c080
parent 77560 77106426ad461e2fe0563f4f23e2da75b4475466
child 77562 9c92a3750cbb69b1862bb2c8d8a6d639ecb2a1ff
push id9122
push usersamuel.thibault@ens-lyon.org
push dateMon, 19 Aug 2019 12:35:12 +0000
treeherdertry-comm-central@9c92a3750cbb [default view] [failures only]
reviewersrjl
bugs1569118
Bug 1569118 - Fix marionette startup on MacOS r=rjl Differential Revision: https://phabricator.services.mozilla.com/D42432
taskcluster/ci/test/marionette.yml
taskcluster/ci/test/test-platforms.yml
testing/marionette/thunderbirdinstance.py
--- a/taskcluster/ci/test/marionette.yml
+++ b/taskcluster/ci/test/marionette.yml
@@ -13,17 +13,18 @@ job-defaults:
                     - marionette/prod_config.py
                     - marionette/mac_taskcluster_config.py
                 windows.*:
                     - marionette/windows_taskcluster_config.py
                 default:
                     - marionette/prod_config.py
                     - remove_executables.py
         extra-options:
-            - --application=thunderbird --test-manifest=../../../../../comm/testing/marionette/unit-tests.ini
+            - --application=thunderbird
+            - --test-manifest=../../../../../comm/testing/marionette/unit-tests.ini
     run-on-projects: built-projects
 
 marionette:
     description: "Marionette unittest run"
     treeherder-symbol: Mn
     max-run-time: 5400
     e10s: false
     instance-size: default
--- a/taskcluster/ci/test/test-platforms.yml
+++ b/taskcluster/ci/test/test-platforms.yml
@@ -107,15 +107,17 @@ windows10-64/debug:
 
 # MacOS X platforms (matching /macosx.*/)
 
 macosx1014-64/debug:
     build-platform: macosx64/debug
     test-sets:
         - mozmill-tests
         - xpcshell-tests
+        - marionette-tests
 
 macosx1014-64-shippable/opt:
     build-platform: macosx64-shippable/opt
     test-sets:
         - mozmill-tests
         - xpcshell-tests
         - mochitest-tests
+        - marionette-tests
--- a/testing/marionette/thunderbirdinstance.py
+++ b/testing/marionette/thunderbirdinstance.py
@@ -26,16 +26,21 @@ thunderbird_prefs = {
     "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
+    "ldap_2.servers.osx.description": "",
+    "ldap_2.servers.osx.dirType": -1,
+    "ldap_2.servers.osx.uri": "",
+
     # Do not check it is the default client at startup
     'mail.shell.checkDefaultClient': False,
 
     # Set up a dummy account to unlock various actions
     'mail.root.none-rel': "[ProfD]Mail",
     'mail.root.pop3-rel': "[ProfD]Mail",
     'mail.account.account1.server': "server1",
     'mail.account.account2.identities': "id1,id2",