Changeset 139831 in webkit

Timestamp:

Jan 15, 2013 8:44:48 PM (11 years ago)

Author:

dpranke@chromium.org

Message:

test-webkitpy: truncate output to the terminal width when necessary
​https://bugs.webkit.org/show_bug.cgi?id=106973

Reviewed by Ojan Vafai.

this implements the same logic for test-webkitpy that we have
for run-webkit-tests (and ninja).

No tests written as this is exercised by running test-webkitpy itself.

• Scripts/webkitpy/test/printer.py:

(Printer.configure):
(Printer._test_line):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/test/printer.py (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-01-15  Dirk Pranke  <dpranke@chromium.org>
+
+        test-webkitpy: truncate output to the terminal width when necessary
+        https://bugs.webkit.org/show_bug.cgi?id=106973
+
+        Reviewed by Ojan Vafai.
+
+        this implements the same logic for test-webkitpy that we have
+        for run-webkit-tests (and ninja).
+
+        No tests written as this is exercised by running test-webkitpy itself.
+
+        * Scripts/webkitpy/test/printer.py:
+        (Printer.configure):
+        (Printer._test_line):
+
 2013-01-15  Dirk Pranke  <dpranke@chromium.org>
 

trunk/Tools/Scripts/webkitpy/test/printer.py

@@ -26 +26 @@
 
 from webkitpy.common.system import outputcapture
+from webkitpy.common.system.systemhost import SystemHost
 from webkitpy.layout_tests.views.metered_stream import MeteredStream
 
@@ -58 +59 @@
             log_level = logging.DEBUG
 
-        self.meter = MeteredStream(self.stream, (options.verbose == 2))
+        self.meter = MeteredStream(self.stream, (options.verbose == 2),
+            number_of_columns=SystemHost().platform.terminal_width())
 
         handler = logging.StreamHandler(self.stream)
@@ -160 +162 @@
 
     def _test_line(self, test_name, suffix):
-        return '[%d/%d] %s%s' % (self.num_completed, self.num_tests, test_name, suffix)
+        format_string = '[%d/%d] %s%s'
+        status_line = format_string % (self.num_completed, self.num_tests, test_name, suffix)
+        if len(status_line) > self.meter.number_of_columns():
+            overflow_columns = len(status_line) - self.meter.number_of_columns()
+            ellipsis = '...'
+            if len(test_name) < overflow_columns + len(ellipsis) + 3:
+                # We don't have enough space even if we elide, just show the test method name.
+                test_name = test_name.split('.')[-1]
+            else:
+                new_length = len(test_name) - overflow_columns - len(ellipsis)
+                prefix = int(new_length / 2)
+                test_name = test_name[:prefix] + ellipsis + test_name[-(new_length - prefix):]
+        return format_string % (self.num_completed, self.num_tests, test_name, suffix)
 
     def print_result(self, run_time):