<!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>[163134] 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/163134">163134</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-30 17:03:37 -0800 (Thu, 30 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>NRWT shouldn't say "Finished writing JSON files" if it failed to to so
https://bugs.webkit.org/show_bug.cgi?id=127966
Reviewed by Alexey Proskuryakov.
Don't say "Finished writing JSON files" if we had failed to generate the JSON file.
Also explicitly say this is for test results server as we're generating two JSON files.
* Scripts/webkitpy/layout_tests/controllers/manager.py:
(Manager._upload_json_files):
* Scripts/webkitpy/layout_tests/layout_package/json_layout_results_generator.py:
(JSONLayoutResultsGenerator.__init__): Don't generate JSON file implicitly inside the constructor.
* Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py:
(JSONResultsGenerator.generate_json_output): Return a boolean indicating whether the generation
had succeeded or not.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testscontrollersmanagerpy">trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testslayout_packagejson_layout_results_generatorpy">trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_layout_results_generator.py</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testslayout_packagejson_results_generatorpy">trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (163133 => 163134)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-01-31 00:41:51 UTC (rev 163133)
+++ trunk/Tools/ChangeLog 2014-01-31 01:03:37 UTC (rev 163134)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-01-30 Ryosuke Niwa <rniwa@webkit.org>
+
+ NRWT shouldn't say "Finished writing JSON files" if it failed to to so
+ https://bugs.webkit.org/show_bug.cgi?id=127966
+
+ Reviewed by Alexey Proskuryakov.
+
+ Don't say "Finished writing JSON files" if we had failed to generate the JSON file.
+ Also explicitly say this is for test results server as we're generating two JSON files.
+
+ * Scripts/webkitpy/layout_tests/controllers/manager.py:
+ (Manager._upload_json_files):
+ * Scripts/webkitpy/layout_tests/layout_package/json_layout_results_generator.py:
+ (JSONLayoutResultsGenerator.__init__): Don't generate JSON file implicitly inside the constructor.
+ * Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py:
+ (JSONResultsGenerator.generate_json_output): Return a boolean indicating whether the generation
+ had succeeded or not.
+
</ins><span class="cx"> 2014-01-30 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> copy-webkitlibraries-to-product-directory should accept command-line arguments for extra work required for optional features rather than relying on environment variables
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testscontrollersmanagerpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py (163133 => 163134)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py 2014-01-31 00:41:51 UTC (rev 163133)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py 2014-01-31 01:03:37 UTC (rev 163134)
</span><span class="lines">@@ -358,9 +358,11 @@
</span><span class="cx"> "layout-tests",
</span><span class="cx"> self._options.master_name)
</span><span class="cx">
</span><del>- _log.debug("Finished writing JSON files.")
</del><ins>+ if generator.generate_json_output():
+ _log.debug("Finished writing JSON file for the test results server.")
+ else:
+ _log.debug("Failed to generate JSON file for the test results server.")
</ins><span class="cx">
</span><del>-
</del><span class="cx"> json_files = ["incremental_results.json", "full_results.json", "times_ms.json"]
</span><span class="cx">
</span><span class="cx"> generator.upload_json_files(json_files)
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testslayout_packagejson_layout_results_generatorpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_layout_results_generator.py (163133 => 163134)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_layout_results_generator.py 2014-01-31 00:41:51 UTC (rev 163133)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_layout_results_generator.py 2014-01-31 01:03:37 UTC (rev 163134)
</span><span class="lines">@@ -72,8 +72,6 @@
</span><span class="cx"> self._failures = dict((test_name, run_results.results_by_name[test_name].type) for test_name in run_results.failures_by_name)
</span><span class="cx"> self._test_timings = run_results.results_by_name
</span><span class="cx">
</span><del>- self.generate_json_output()
-
</del><span class="cx"> def _get_path_relative_to_layout_test_root(self, test):
</span><span class="cx"> """Returns the path of the test relative to the layout test root.
</span><span class="cx"> For example, for:
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testslayout_packagejson_results_generatorpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py (163133 => 163134)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py 2014-01-31 00:41:51 UTC (rev 163133)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py 2014-01-31 01:03:37 UTC (rev 163134)
</span><span class="lines">@@ -235,9 +235,11 @@
</span><span class="cx">
</span><span class="cx"> def generate_json_output(self):
</span><span class="cx"> json_object = self.get_json()
</span><del>- if json_object:
- file_path = self._filesystem.join(self._results_directory, self.INCREMENTAL_RESULTS_FILENAME)
- write_json(self._filesystem, json_object, file_path)
</del><ins>+ if not json_object:
+ return False
+ file_path = self._filesystem.join(self._results_directory, self.INCREMENTAL_RESULTS_FILENAME)
+ write_json(self._filesystem, json_object, file_path)
+ return True
</ins><span class="cx">
</span><span class="cx"> def generate_times_ms_file(self):
</span><span class="cx"> # FIXME: rename to generate_times_ms_file. This needs to be coordinated with
</span></span></pre>
</div>
</div>
</body>
</html>