Changeset 192565 in webkit

Timestamp:

Nov 17, 2015, 10:27:09 PM (9 years ago)

Author:

ap@apple.com

Message:

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):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/views/printing.py (modified) (3 diffs)
• Scripts/webkitpy/layout_tests/views/printing_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+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):
+
 2015-11-16  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Tools/Scripts/webkitpy/layout_tests/views/printing.py

@@ -288 +288 @@
         self._print_quiet("")
 
-    def _test_status_line(self, test_name, suffix):
+    def _test_status_line(self, test_name, suffix, truncate=True):
         format_string = '[%d/%d] %s%s'
         status_line = format_string % (self.num_started, self.num_tests, test_name, suffix)
-        if len(status_line) > self._meter.number_of_columns():
+        if truncate and len(status_line) > self._meter.number_of_columns():
             overflow_columns = len(status_line) - self._meter.number_of_columns()
             ellipsis = '...'
@@ -325 +325 @@
             self._print_test_trace(result, exp_str, got_str)
         elif (self._options.verbose and not self._options.debug_rwt_logging) or not expected:
-            self.writeln(self._test_status_line(test_name, result_message))
+            self.writeln(self._test_status_line(test_name, result_message, truncate=False))
         elif self.num_started == self.num_tests:
             self._meter.write_update('')
@@ -335 +335 @@
 
             for test_name, result_message in self._completed_tests:
-                self._meter.write_throttled_update(self._test_status_line(test_name, result_message))
+                self._meter.write_throttled_update(self._test_status_line(test_name, result_message, truncate=False))
             self._completed_tests = []
         self._running_tests.remove(test_name)

trunk/Tools/Scripts/webkitpy/layout_tests/views/printing_unittest.py

@@ -151 +151 @@
         self.assertEqual(actual, '[0/0] fast/dom/HTMLFormElement/associa...after-index-assertion-fail1.html passed')
 
+        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')
+
         printer._meter.number_of_columns = lambda: 89
         actual = printer._test_status_line('fast/dom/HTMLFormElement/associated-elements-after-index-assertion-fail1.html', ' passed')