Skip to content

Commit 2bb1711

Browse files
committed
Add colored print to test harness output
1 parent b4ffae4 commit 2bb1711

File tree

2 files changed

+18
-7
lines changed

2 files changed

+18
-7
lines changed

test/parallel_testsuite.py

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import common
1717
from common import errlog
1818

19+
from tools.diagnostics import with_color, CYAN, GREEN, RED
1920
from tools.utils import WINDOWS
2021

2122

@@ -304,35 +305,41 @@ def compute_progress(self):
304305
with self.lock:
305306
val = f'[{int(self.progress_counter.value * 100 / self.num_tests)}%] '
306307
self.progress_counter.value += 1
307-
return val
308+
return with_color(CYAN, val)
308309

309310
def addSuccess(self, test):
310-
errlog(f'{self.compute_progress()}{test} ... ok ({self.calculateElapsed():.2f}s)')
311+
msg = f'ok ({self.calculateElapsed():.2f}s)'
312+
errlog(f'{self.compute_progress()}{test} ... {with_color(GREEN, msg)}')
311313
self.buffered_result = BufferedTestSuccess(test)
312314
self.test_result = 'success'
313315

314316
def addExpectedFailure(self, test, err):
315-
errlog(f'{self.compute_progress()}{test} ... expected failure ({self.calculateElapsed():.2f}s)')
317+
msg = f'expected failure ({self.calculateElapsed():.2f}s)'
318+
errlog(f'{self.compute_progress()}{test} ... {with_color(RED, msg)}')
316319
self.buffered_result = BufferedTestExpectedFailure(test, err)
317320
self.test_result = 'expected failure'
318321

319322
def addUnexpectedSuccess(self, test):
320-
errlog(f'{self.compute_progress()}{test} ... unexpected success ({self.calculateElapsed():.2f}s)')
323+
msg = f'unexpected success ({self.calculateElapsed():.2f}s)'
324+
errlog(f'{self.compute_progress()}{test} ... {with_color(RED, msg)}')
321325
self.buffered_result = BufferedTestUnexpectedSuccess(test)
322326
self.test_result = 'unexpected success'
323327

324328
def addSkip(self, test, reason):
325-
errlog(f"{self.compute_progress()}{test} ... skipped '{reason}'")
329+
msg = f"skipped '{reason}'"
330+
errlog(f"{self.compute_progress()}{test} ... {with_color(CYAN, msg)}")
326331
self.buffered_result = BufferedTestSkip(test, reason)
327332
self.test_result = 'skipped'
328333

329334
def addFailure(self, test, err):
330-
errlog(f'{self.compute_progress()}{test} ... FAIL')
335+
msg = f'{test} ... FAIL'
336+
errlog(f'{self.compute_progress()}{with_color(RED, msg)}')
331337
self.buffered_result = BufferedTestFailure(test, err)
332338
self.test_result = 'failed'
333339

334340
def addError(self, test, err):
335-
errlog(f'{self.compute_progress()}{test} ... ERROR')
341+
msg = f'{test} ... ERROR'
342+
errlog(f'{self.compute_progress()}{with_color(RED, msg)}')
336343
self.buffered_result = BufferedTestError(test, err)
337344
self.test_result = 'errored'
338345

tools/diagnostics.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@ def reset_color():
5757
return '\033[0m'
5858

5959

60+
def with_color(color, text):
61+
return f'\033[9{color}m{text}\033[0m'
62+
63+
6064
def diag(level, msg, *args):
6165
# Format output message as:
6266
# <tool>: <level>: msg

0 commit comments

Comments
 (0)