Backed out changeset a812bb3848d0 (bug 1237179) for test failures in VideoPuppeteer Media Tests
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Thu, 21 Jan 2016 14:18:03 +0100
changeset 310886 57a4738271792310f2b061fee8447060b13e961d
parent 310885 7fc6b3d4c26f654144e4c7b90702b91f3ad31ea7
child 310887 07f847a16bf17ded6ae5fc32bb263f0d30e46149
push id5513
push userraliiev@mozilla.com
push dateMon, 25 Jan 2016 13:55:34 +0000
treeherdermozilla-beta@5ee97dd05b5c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1237179
milestone45.0a2
backs outa812bb3848d0e5f412c2eed448263b856719b8a6
Backed out changeset a812bb3848d0 (bug 1237179) for test failures in VideoPuppeteer Media Tests
build/mach_bootstrap.py
testing/firefox-ui/mach_commands.py
testing/marionette/client/marionette/runtests.py
--- a/build/mach_bootstrap.py
+++ b/build/mach_bootstrap.py
@@ -61,24 +61,29 @@ SEARCH_PATHS = [
     'python/requests',
     'python/slugid',
     'build',
     'config',
     'dom/bindings',
     'dom/bindings/parser',
     'layout/tools/reftest',
     'other-licenses/ply',
+    'xpcom/idl-parser',
     'testing',
-    'testing/firefox-ui/harness',
-    'testing/firefox-ui/tests',
-    'testing/luciddream',
+    'testing/tools/autotry',
+    'testing/taskcluster',
+    'testing/xpcshell',
+    'testing/web-platform',
+    'testing/web-platform/harness',
+    'testing/web-platform/tests/tools/wptserve',
     'testing/marionette/client',
     'testing/marionette/client/marionette/runner/mixins/browsermob-proxy-py',
     'testing/marionette/transport',
     'testing/marionette/driver',
+    'testing/luciddream',
     'testing/mozbase/mozcrash',
     'testing/mozbase/mozdebug',
     'testing/mozbase/mozdevice',
     'testing/mozbase/mozfile',
     'testing/mozbase/mozhttpd',
     'testing/mozbase/mozinfo',
     'testing/mozbase/mozinstall',
     'testing/mozbase/mozleak',
@@ -87,23 +92,16 @@ SEARCH_PATHS = [
     'testing/mozbase/mozprocess',
     'testing/mozbase/mozprofile',
     'testing/mozbase/mozrunner',
     'testing/mozbase/mozsystemmonitor',
     'testing/mozbase/mozscreenshot',
     'testing/mozbase/moztest',
     'testing/mozbase/mozversion',
     'testing/mozbase/manifestparser',
-    'testing/puppeteer/firefox',
-    'testing/taskcluster',
-    'testing/tools/autotry',
-    'testing/web-platform',
-    'testing/web-platform/harness',
-    'testing/web-platform/tests/tools/wptserve',
-    'testing/xpcshell',
     'xpcom/idl-parser',
 ]
 
 # Individual files providing mach commands.
 MACH_MODULES = [
     'addon-sdk/mach_commands.py',
     'build/valgrind/mach_commands.py',
     'dom/bindings/mach_commands.py',
@@ -112,24 +110,24 @@ MACH_MODULES = [
     'python/mach/mach/commands/commandinfo.py',
     'python/compare-locales/mach_commands.py',
     'python/mozboot/mozboot/mach_commands.py',
     'python/mozbuild/mozbuild/mach_commands.py',
     'python/mozbuild/mozbuild/backend/mach_commands.py',
     'python/mozbuild/mozbuild/compilation/codecomplete.py',
     'python/mozbuild/mozbuild/frontend/mach_commands.py',
     'services/common/tests/mach_commands.py',
-    'testing/firefox-ui/mach_commands.py',
     'testing/luciddream/mach_commands.py',
     'testing/mach_commands.py',
+    'testing/taskcluster/mach_commands.py',
     'testing/marionette/mach_commands.py',
     'testing/mochitest/mach_commands.py',
     'testing/mozharness/mach_commands.py',
+    'testing/xpcshell/mach_commands.py',
     'testing/talos/mach_commands.py',
-    'testing/taskcluster/mach_commands.py',
     'testing/web-platform/mach_commands.py',
     'testing/xpcshell/mach_commands.py',
     'tools/docs/mach_commands.py',
     'tools/mercurial/mach_commands.py',
     'tools/mach_commands.py',
     'tools/power/mach_commands.py',
     'mobile/android/mach_commands.py',
 ]
deleted file mode 100644
--- a/testing/firefox-ui/mach_commands.py
+++ /dev/null
@@ -1,68 +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 absolute_import, unicode_literals
-
-import os
-import sys
-
-from mozbuild.base import (
-    MachCommandBase,
-    MachCommandConditions as conditions,
-)
-
-from mach.decorators import (
-    CommandProvider,
-    Command,
-)
-
-
-def setup_argument_parser():
-    from firefox_ui_harness.arguments.base import FirefoxUIArguments
-    return FirefoxUIArguments()
-
-
-def run_firefox_ui_test(tests, testtype=None,
-                        binary=None, topsrcdir=None, **kwargs):
-    from mozlog.structured import commandline
-    from firefox_ui_harness import cli_functional
-    from firefox_ui_harness.arguments import FirefoxUIArguments
-
-    parser = FirefoxUIArguments()
-    commandline.add_logging_group(parser)
-    args = parser.parse_args()
-
-    if not tests:
-        tests = [os.path.join(topsrcdir,
-                 'testing/firefox-ui/tests/firefox_ui_tests/manifest.ini')]
-    args.tests = tests
-
-    args.binary = binary
-    path, exe = os.path.split(args.binary)
-
-    for k, v in kwargs.iteritems():
-        setattr(args, k, v)
-
-    parser.verify_usage(args)
-
-    args.logger = commandline.setup_logging("Firefox UI - Functional Tests",
-                                            args,
-                                            {"mach": sys.stdout})
-    failed = cli_functional.mn_cli(cli_functional.FirefoxUITestRunner, args=args)
-    if failed > 0:
-        return 1
-    else:
-        return 0
-
-
-@CommandProvider
-class MachCommands(MachCommandBase):
-    @Command('firefox-ui-test', category='testing',
-             description='Run Firefox UI functional tests.',
-             conditions=[conditions.is_firefox],
-             parser=setup_argument_parser,
-             )
-    def run_firefox_ui_test(self, tests, **kwargs):
-        kwargs['binary'] = self.get_binary_path('app')
-        return run_firefox_ui_test(tests, topsrcdir=self.topsrcdir, **kwargs)
--- a/testing/marionette/client/marionette/runtests.py
+++ b/testing/marionette/client/marionette/runtests.py
@@ -72,28 +72,28 @@ class MarionetteHarness(object):
             return runner.failed
         except Exception:
             self.args.logger.error('Failure during test execution.',
                                    exc_info=True)
             raise
 
 
 def cli(runner_class=MarionetteTestRunner, parser_class=MarionetteArguments,
-        harness_class=MarionetteHarness, args=None):
+        harness_class=MarionetteHarness):
     """
     Call the harness to parse args and run tests.
 
     The following exit codes are expected:
     - Test failures: 10
     - Harness/other failures: 1
     - Success: 0
     """
     logger = mozlog.commandline.setup_logging('Marionette test runner', {})
     try:
-        failed = harness_class(runner_class, parser_class, args=args).run()
+        failed = harness_class(runner_class, parser_class).run()
         if failed > 0:
             sys.exit(10)
     except Exception:
         logger.error('Failure during harness setup', exc_info=True)
         sys.exit(1)
     sys.exit(0)
 
 if __name__ == "__main__":