<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[174743] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/174743">174743</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-10-15 13:56:11 -0700 (Wed, 15 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add --json flag to test-webkitpy to emit JSON formatted test results
to stdout
https://bugs.webkit.org/show_bug.cgi?id=137353
Patch by Jake Nielsen <jacob_nielsen@apple.com> on 2014-10-15
Reviewed by Daniel Bates.
* Scripts/webkitpy/port/server_process_unittest.py:
Adds the read method to MockFile to allow the stdout of test_webkitpy
to be redirected without causing erroneous test failures.
In particular,
webkitpy.port.server_process_unittest.TestServerProcess.test_broken_pipe
and
webkitpy.port.server_process_unittest.TestServerProcess.test_cleanup
because when redirecting to a file, the
_wait_for_data_and_update_buffers_using_select method in
server_process.py will find that there is a read file descriptor in
its call to select.select, which eventually leads to it calling read()
on the MockFile object.
(MockFile.read):
* Scripts/webkitpy/test/main.py:
Adds the _print_results_as_json method and the --json flag which
determines whether _print_results_as_json will get called.
(Tester._parse_args):
(Tester._print_results_as_json):
(Tester._print_results_as_json.result_dict_from_tuple):
(Tester._run_tests):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpyportserver_process_unittestpy">trunk/Tools/Scripts/webkitpy/port/server_process_unittest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpytestmainpy">trunk/Tools/Scripts/webkitpy/test/main.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (174742 => 174743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-10-15 19:39:05 UTC (rev 174742)
+++ trunk/Tools/ChangeLog 2014-10-15 20:56:11 UTC (rev 174743)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2014-10-15 Jake Nielsen <jacob_nielsen@apple.com>
+
+ Add --json flag to test-webkitpy to emit JSON formatted test results
+ to stdout
+ https://bugs.webkit.org/show_bug.cgi?id=137353
+
+ Reviewed by Daniel Bates.
+
+ * Scripts/webkitpy/port/server_process_unittest.py:
+ Adds the read method to MockFile to allow the stdout of test_webkitpy
+ to be redirected without causing erroneous test failures.
+ In particular,
+ webkitpy.port.server_process_unittest.TestServerProcess.test_broken_pipe
+ and
+ webkitpy.port.server_process_unittest.TestServerProcess.test_cleanup
+ because when redirecting to a file, the
+ _wait_for_data_and_update_buffers_using_select method in
+ server_process.py will find that there is a read file descriptor in
+ its call to select.select, which eventually leads to it calling read()
+ on the MockFile object.
+ (MockFile.read):
+ * Scripts/webkitpy/test/main.py:
+ Adds the _print_results_as_json method and the --json flag which
+ determines whether _print_results_as_json will get called.
+ (Tester._parse_args):
+ (Tester._print_results_as_json):
+ (Tester._print_results_as_json.result_dict_from_tuple):
+ (Tester._run_tests):
+
</ins><span class="cx"> 2014-10-13 David Farler <dfarler@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] LayoutTestRelay: Detect broken pipe when reading simulator app's stdout and stderr.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportserver_process_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/server_process_unittest.py (174742 => 174743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/server_process_unittest.py 2014-10-15 19:39:05 UTC (rev 174742)
+++ trunk/Tools/Scripts/webkitpy/port/server_process_unittest.py 2014-10-15 20:56:11 UTC (rev 174743)
</span><span class="lines">@@ -66,6 +66,10 @@
</span><span class="cx"> self._server_process.broken_pipes.append(self)
</span><span class="cx"> raise IOError
</span><span class="cx">
</span><ins>+ def read(self, size=0):
+ # This means end of file
+ return ''
+
</ins><span class="cx"> def close(self):
</span><span class="cx"> self.closed = True
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpytestmainpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/test/main.py (174742 => 174743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/test/main.py 2014-10-15 19:39:05 UTC (rev 174742)
+++ trunk/Tools/Scripts/webkitpy/test/main.py 2014-10-15 20:56:11 UTC (rev 174743)
</span><span class="lines">@@ -24,8 +24,11 @@
</span><span class="cx"> """unit testing code for webkitpy."""
</span><span class="cx">
</span><span class="cx"> import StringIO
</span><ins>+import itertools
+import json
</ins><span class="cx"> import logging
</span><span class="cx"> import multiprocessing
</span><ins>+import operator
</ins><span class="cx"> import optparse
</span><span class="cx"> import os
</span><span class="cx"> import sys
</span><span class="lines">@@ -72,6 +75,17 @@
</span><span class="cx"> return not tester.run()
</span><span class="cx">
</span><span class="cx">
</span><ins>+def _print_results_as_json(stream, all_test_names, failures, errors):
+ def result_dict_from_tuple(result_tuple):
+ return {'name': result_tuple[0], 'result': result_tuple[1]}
+
+ results = {}
+ results['failures'] = map(result_dict_from_tuple, sorted(failures, key=operator.itemgetter(0)))
+ results['errors'] = map(result_dict_from_tuple, sorted(errors, key=operator.itemgetter(0)))
+ results['passes'] = sorted(set(all_test_names) - set(map(operator.itemgetter(0), failures)) - set(map(operator.itemgetter(0), errors)))
+
+ json.dump(results, stream, separators=(',', ':'))
+
</ins><span class="cx"> class Tester(object):
</span><span class="cx"> def __init__(self, filesystem=None):
</span><span class="cx"> self.finder = Finder(filesystem or FileSystem())
</span><span class="lines">@@ -102,6 +116,8 @@
</span><span class="cx"> help='display per-test execution time (implies --verbose)')
</span><span class="cx"> parser.add_option('-v', '--verbose', action='count', default=0,
</span><span class="cx"> help='verbose output (specify once for individual test results, twice for debug messages)')
</span><ins>+ parser.add_option('--json', action='store_true', default=False,
+ help='write JSON formatted test results to stdout')
</ins><span class="cx">
</span><span class="cx"> parser.epilog = ('[args...] is an optional list of modules, test_classes, or individual tests. '
</span><span class="cx"> 'If no args are given, all the tests will be run.')
</span><span class="lines">@@ -156,6 +172,9 @@
</span><span class="cx">
</span><span class="cx"> self.printer.print_result(time.time() - start)
</span><span class="cx">
</span><ins>+ if self._options.json:
+ _print_results_as_json(sys.stdout, itertools.chain(parallel_tests, serial_tests), test_runner.failures, test_runner.errors)
+
</ins><span class="cx"> if self._options.coverage:
</span><span class="cx"> cov.stop()
</span><span class="cx"> cov.save()
</span></span></pre>
</div>
</div>
</body>
</html>