Attachment 347876 Details for Bug 188869 – Patch

[patch] Patch

bug-188869-20180822164747.patch (text/plain), 4.56 KB, created by Jonathan Bedard on 2018-08-22 16:47:48 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Bedard

Created: 2018-08-22 16:47:48 PDT

Size: 4.56 KB

patch

obsolete

>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 235210)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,23 @@
>+2018-08-22  Jonathan Bedard  <jbedard@apple.com>
>+
>+        API tests should output json results
>+        https://bugs.webkit.org/show_bug.cgi?id=188869
>+        <rdar://problem/43615652>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        JSON output for API tests is of the form:
>+            {
>+                <test_name>: {"status": <test status>, "output": <test log>}
>+            }
>+        Tests which are successful are not displayed in the json output.
>+
>+        * Scripts/webkitpy/api_tests/manager.py:
>+        (Manager.run): Print test results to stdout as a json dictionary.
>+        * Scripts/webkitpy/api_tests/run_api_tests.py:
>+        (run): Pass json option.
>+        (parse_args): Add --json flag.
>+
> 2018-08-22  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         [Attachment Support] Support dragging attachment elements out as files on macOS
>Index: Tools/Scripts/webkitpy/api_tests/manager.py
>===================================================================
>--- Tools/Scripts/webkitpy/api_tests/manager.py	(revision 235202)
>+++ Tools/Scripts/webkitpy/api_tests/manager.py	(working copy)
>@@ -23,6 +23,7 @@
> import logging
> import os
> 
>+from json import dumps
> from webkitpy.api_tests.runner import Runner
> from webkitpy.common.system.executive import ScriptError
> from webkitpy.xcode.device_type import DeviceType
>@@ -148,7 +149,7 @@ class Manager(object):
>                 return self._port.path_to_api_test_binaries().keys()
>         return binaries or self._port.path_to_api_test_binaries().keys()
> 
>-    def run(self, args):
>+    def run(self, args, json=False):
>         self._stream.write_update('Checking build ...')
>         if not self._port.check_api_test_build(self._binaries_for_arguments(args)):
>             _log.error('Build check failed')
>@@ -184,7 +185,30 @@ class Manager(object):
>         disabled = len(runner.result_map_by_status(runner.STATUS_DISABLED))
>         _log.info('Ran {} tests of {} with {} successful'.format(len(runner.results) - disabled, len(test_names), len(successful)))
> 
>-        self._stream.writeln('------------------------------')
>+        if json:
>+            if len(successful) + disabled == len(test_names):
>+                self._stream.writeln('{}')
>+                return Manager.SUCCESS
>+
>+            result_dictionary = {}
>+            for test in test_names:
>+                if test not in runner.results:
>+                    result_dictionary[test] = {'status': 'Skipped', 'output': None}
>+
>+            for test, result in runner.results.iteritems():
>+                status_to_string = {
>+                    runner.STATUS_FAILED: 'Failed',
>+                    runner.STATUS_CRASHED: 'Crashed',
>+                    runner.STATUS_TIMEOUT: 'Timedout',
>+                }.get(result[0])
>+                if not status_to_string:
>+                    continue
>+                result_dictionary[test] = {'status': status_to_string, 'output': result[1]}
>+            self._stream.writeln(dumps(result_dictionary, indent=4, sort_keys=True))
>+            return Manager.FAILED_TESTS
>+
>+        self._stream.writeln('-' * 30)
>+
>         if len(successful) + disabled == len(test_names):
>             self._stream.writeln('All tests successfully passed!')
>             return Manager.SUCCESS
>Index: Tools/Scripts/webkitpy/api_tests/run_api_tests.py
>===================================================================
>--- Tools/Scripts/webkitpy/api_tests/run_api_tests.py	(revision 235202)
>+++ Tools/Scripts/webkitpy/api_tests/run_api_tests.py	(working copy)
>@@ -73,7 +73,7 @@ def run(port, options, args, logging_str
>         stream = MeteredStream(logging_stream, options.verbose, logger=logger, number_of_columns=port.host.platform.terminal_width(), print_timestamps=options.timestamps)
>         manager = Manager(port, options, stream)
> 
>-        result = manager.run(args)
>+        result = manager.run(args, json=options.json)
>         _log.debug("Testing completed, Exit status: %d" % result)
>         return result
>     finally:
>@@ -92,6 +92,8 @@ def parse_args(args):
>                              help='Enable verbose printing'),
>         optparse.make_option('--timestamps', action='store_true', default=False,
>                              help='Print timestamps for each logged line'),
>+        optparse.make_option('--json', action='store_true', default=False,
>+                             help='Print test results as JSON'),
>     ]))
> 
>     option_group_definitions.append(('WebKit Options', [

Actions: View | Formatted Diff | Diff

Attachments on bug 188869: 347876 | 347879 | 347952 | 347956 | 347960