<!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>[192565] 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/192565">192565</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2015-11-17 22:27:09 -0800 (Tue, 17 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>run-webkit-tests should not truncate persistent lines
https://bugs.webkit.org/show_bug.cgi?id=151376
rdar://problem/23162775
Reviewed by Antti Koivisto.
It is OK to truncate progress lines, but it's not OK to truncate error (or otherwise
unexpected result) messages that remain on the screen to be read. In practice, this
almost always truncates the test path, which is important to see.
* Scripts/webkitpy/layout_tests/views/printing.py:
(Printer._test_status_line):
(Printer.print_finished_test):
* Scripts/webkitpy/layout_tests/views/printing_unittest.py:
(Testprinter.test_test_status_line):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testsviewsprintingpy">trunk/Tools/Scripts/webkitpy/layout_tests/views/printing.py</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testsviewsprinting_unittestpy">trunk/Tools/Scripts/webkitpy/layout_tests/views/printing_unittest.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (192564 => 192565)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-11-18 03:00:43 UTC (rev 192564)
+++ trunk/Tools/ChangeLog 2015-11-18 06:27:09 UTC (rev 192565)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-11-17 Alexey Proskuryakov <ap@apple.com>
+
+ run-webkit-tests should not truncate persistent lines
+ https://bugs.webkit.org/show_bug.cgi?id=151376
+ rdar://problem/23162775
+
+ Reviewed by Antti Koivisto.
+
+ It is OK to truncate progress lines, but it's not OK to truncate error (or otherwise
+ unexpected result) messages that remain on the screen to be read. In practice, this
+ almost always truncates the test path, which is important to see.
+
+ * Scripts/webkitpy/layout_tests/views/printing.py:
+ (Printer._test_status_line):
+ (Printer.print_finished_test):
+ * Scripts/webkitpy/layout_tests/views/printing_unittest.py:
+ (Testprinter.test_test_status_line):
+
</ins><span class="cx"> 2015-11-16 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Fix GTK+ unit tests after r192469.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testsviewsprintingpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/views/printing.py (192564 => 192565)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/views/printing.py 2015-11-18 03:00:43 UTC (rev 192564)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/views/printing.py 2015-11-18 06:27:09 UTC (rev 192565)
</span><span class="lines">@@ -287,10 +287,10 @@
</span><span class="cx"> self._print_quiet(summary)
</span><span class="cx"> self._print_quiet("")
</span><span class="cx">
</span><del>- def _test_status_line(self, test_name, suffix):
</del><ins>+ def _test_status_line(self, test_name, suffix, truncate=True):
</ins><span class="cx"> format_string = '[%d/%d] %s%s'
</span><span class="cx"> status_line = format_string % (self.num_started, self.num_tests, test_name, suffix)
</span><del>- if len(status_line) > self._meter.number_of_columns():
</del><ins>+ if truncate and len(status_line) > self._meter.number_of_columns():
</ins><span class="cx"> overflow_columns = len(status_line) - self._meter.number_of_columns()
</span><span class="cx"> ellipsis = '...'
</span><span class="cx"> if len(test_name) < overflow_columns + len(ellipsis) + 2:
</span><span class="lines">@@ -324,7 +324,7 @@
</span><span class="cx"> if self._options.details:
</span><span class="cx"> self._print_test_trace(result, exp_str, got_str)
</span><span class="cx"> elif (self._options.verbose and not self._options.debug_rwt_logging) or not expected:
</span><del>- self.writeln(self._test_status_line(test_name, result_message))
</del><ins>+ self.writeln(self._test_status_line(test_name, result_message, truncate=False))
</ins><span class="cx"> elif self.num_started == self.num_tests:
</span><span class="cx"> self._meter.write_update('')
</span><span class="cx"> else:
</span><span class="lines">@@ -334,7 +334,7 @@
</span><span class="cx"> self._completed_tests.append([test_name, result_message])
</span><span class="cx">
</span><span class="cx"> for test_name, result_message in self._completed_tests:
</span><del>- self._meter.write_throttled_update(self._test_status_line(test_name, result_message))
</del><ins>+ self._meter.write_throttled_update(self._test_status_line(test_name, result_message, truncate=False))
</ins><span class="cx"> self._completed_tests = []
</span><span class="cx"> self._running_tests.remove(test_name)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testsviewsprinting_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/views/printing_unittest.py (192564 => 192565)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/views/printing_unittest.py 2015-11-18 03:00:43 UTC (rev 192564)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/views/printing_unittest.py 2015-11-18 06:27:09 UTC (rev 192565)
</span><span class="lines">@@ -150,6 +150,11 @@
</span><span class="cx"> self.assertEqual(80, len(actual))
</span><span class="cx"> self.assertEqual(actual, '[0/0] fast/dom/HTMLFormElement/associa...after-index-assertion-fail1.html passed')
</span><span class="cx">
</span><ins>+ printer._meter.number_of_columns = lambda: 80
+ actual = printer._test_status_line('fast/dom/HTMLFormElement/associated-elements-after-index-assertion-fail1.html', ' passed', truncate=False)
+ self.assertEqual(90, len(actual))
+ self.assertEqual(actual, '[0/0] fast/dom/HTMLFormElement/associated-elements-after-index-assertion-fail1.html passed')
+
</ins><span class="cx"> printer._meter.number_of_columns = lambda: 89
</span><span class="cx"> actual = printer._test_status_line('fast/dom/HTMLFormElement/associated-elements-after-index-assertion-fail1.html', ' passed')
</span><span class="cx"> self.assertEqual(89, len(actual))
</span></span></pre>
</div>
</div>
</body>
</html>