aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-02-29 19:19:49 +0530
committerbors-servo <lbergstrom+bors@mozilla.com>2016-02-29 19:19:49 +0530
commit872ee1953468113a6edda27badf11c2af7d9868a (patch)
treecd0aed204d4f5bf6afcb86813cbcde5eb9b358c5
parentdfdeabf57df02cf4b8a878b3b9933a08d156082d (diff)
parent4170f20828e6484796e3f095c94a2e32e2844722 (diff)
downloadservo-872ee1953468113a6edda27badf11c2af7d9868a.tar.gz
servo-872ee1953468113a6edda27badf11c2af7d9868a.zip
Auto merge of #9773 - notriddle:wpt_line_width, r=nox
Truncate long test names in WPT. Makes the output readable on 100-character terminals. <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9773) <!-- Reviewable:end -->
-rw-r--r--tests/wpt/grouping_formatter.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/tests/wpt/grouping_formatter.py b/tests/wpt/grouping_formatter.py
index 43df1cd259b..5bca29eec62 100644
--- a/tests/wpt/grouping_formatter.py
+++ b/tests/wpt/grouping_formatter.py
@@ -6,6 +6,7 @@ from mozlog.formatters import base
import collections
import os
import sys
+import subprocess
DEFAULT_MOVE_UP_CODE = u"\x1b[A"
DEFAULT_CLEAR_EOL_CODE = u"\x1b[K"
@@ -28,6 +29,7 @@ class GroupingFormatter(base.BaseFormatter):
# TODO(mrobinson, 8313): We need to add support for Windows terminals here.
if self.interactive:
+ self.line_width = int(subprocess.check_output(['stty', 'size']).split()[1])
self.move_up, self.clear_eol = self.get_move_up_and_clear_eol_codes()
self.expected = {
@@ -88,8 +90,12 @@ class GroupingFormatter(base.BaseFormatter):
if self.running_tests:
indent = " " * len(new_display)
+ if self.interactive:
+ max_width = self.line_width - len(new_display)
+ else:
+ max_width = sys.maxsize
return new_display + ("\n%s" % indent).join(
- self.running_tests.values()) + "\n"
+ val[:max_width] for val in self.running_tests.values()) + "\n"
else:
return new_display + "No tests running.\n"