Bug 1543725 - Backed out 2 changesets for perma-failures on Mac. a=backout DONTBUILD
authorJorg K <jorgk@jorgk.com>
Sat, 06 Jul 2019 07:49:54 +0200
changeset 36041 22be14b4e4fac49c2af45d306ac19b96b8e1e60b
parent 36040 8da790400467339fff4f0954284c9ac69b98c7e8
child 36042 ea8da6cabe7a75461820f8f60a17ae56fdf55a38
push id392
push userclokep@gmail.com
push dateMon, 02 Sep 2019 20:17:19 +0000
reviewersbackout
bugs1543725
Bug 1543725 - Backed out 2 changesets for perma-failures on Mac. a=backout DONTBUILD Backed out changeset 7a364236efd0 (bug 1543725) Backed out changeset f5f85315ba00 (bug 1543725)
build/virtualenv_packages.txt
mail/moz.build
mail/test/marionette/manifest.ini
mail/test/marionette/moz.build
mail/test/marionette/test_empty.py
taskcluster/ci/test/kind.yml
taskcluster/ci/test/marionette.yml
taskcluster/ci/test/test-sets.yml
testing/marionette/thunderbirdinstance.py
testing/marionette/unit-tests.ini
--- a/build/virtualenv_packages.txt
+++ b/build/virtualenv_packages.txt
@@ -1,2 +1,1 @@
 comm.pth:comm/taskcluster
-comm.pth:comm/testing/marionette
--- a/mail/moz.build
+++ b/mail/moz.build
@@ -16,11 +16,11 @@ DIRS += [
 ]
 
 if CONFIG['MAKENSISU']:
     DIRS += ['installer/windows']
 
 if CONFIG['MOZ_BUNDLED_FONTS']:
     DIRS += ['/%s/browser/fonts' % CONFIG['mozreltopsrcdir']]
 
-TEST_DIRS += ['test/mozmill', 'test/marionette']
+TEST_DIRS += ['test/mozmill']
 
 FINAL_TARGET_FILES.defaults += ['app/permissions']
deleted file mode 100644
--- a/mail/test/marionette/manifest.ini
+++ /dev/null
@@ -1,1 +0,0 @@
-[test_empty.py]
deleted file mode 100644
--- a/mail/test/marionette/moz.build
+++ /dev/null
@@ -1,6 +0,0 @@
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MARIONETTE_UNIT_MANIFESTS += ['manifest.ini']
deleted file mode 100644
--- a/mail/test/marionette/test_empty.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-from __future__ import print_function
-
-from marionette_harness import MarionetteTestCase
-
-class TestMain(MarionetteTestCase):
-
-    def test_empty(self):
-        return
--- a/taskcluster/ci/test/kind.yml
+++ b/taskcluster/ci/test/kind.yml
@@ -13,17 +13,16 @@ kind-dependencies:
 transforms:
     - taskgraph.transforms.tests:transforms
     - comm_taskgraph:tests_drop_1proc
     - taskgraph.transforms.job:transforms
     - taskgraph.transforms.task:transforms
 
 jobs-from:
     - tests.yml
-    - marionette.yml
 
 # These apply to all included test yml files listed in jobs-from
 job-defaults:
     when:
         files-changed:
             # Include everything in comm-central except suite/
             # https://bugzilla.mozilla.org/show_bug.cgi?id=1422060
             - comm/build
deleted file mode 100644
--- a/taskcluster/ci/test/marionette.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
----
-# These merge with defaults set in kind.yml
-job-defaults:
-    suite: marionette
-    mozharness:
-        script: marionette.py
-        config:
-            by-test-platform:
-                macosx.*:
-                    - 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
-    run-on-projects: built-projects
-
-marionette:
-    description: "Marionette unittest run"
-    treeherder-symbol: Mn
-    max-run-time: 5400
-    e10s: false
-    instance-size: default
-    chunks: 1
-
-marionette-headless:
-    description: "Marionette headless unittest run"
-    treeherder-symbol: MnH
-    max-run-time: 5400
-    e10s: false
-    instance-size: default
-    mozharness:
-        extra-options:
-            - --headless
--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -17,13 +17,11 @@
 # Universal tests
 #
 # Tests that run just about everywhere; common-tests is the shared core, with
 # a few add-on test sets that are included or omitted on some platforms.
 
 common-tests:
     - xpcshell
     - mozmill
-    - marionette
-    - marionette-headless
 
 optimized-tests:
     - mochitest-thunderbird
deleted file mode 100644
--- a/testing/marionette/thunderbirdinstance.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/
-
-# ALL CHANGES TO THIS FILE MUST HAVE REVIEW FROM A MARIONETTE PEER!
-#
-# The Marionette Python client is used out-of-tree with various builds of
-# Firefox. Removing a preference from this file will cause regressions,
-# so please be careful and get review from a Testing :: Marionette peer
-# before you make any changes to this file.
-
-from __future__ import absolute_import
-
-
-thunderbird_prefs = {
-    # Disable application updates
-    "app.update.disabledForTesting": True,
-
-    # Enable output of dump()
-    "browser.dom.window.dump.enabled": True,
-
-    # Do not show the EULA notification which can interfer with tests
-    "browser.EULA.override": True,
-
-    # 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",
-}
deleted file mode 100644
--- a/testing/marionette/unit-tests.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-# mail tests
-[include:../../mail/test/marionette/manifest.ini]