|
16 | 16 | import common
|
17 | 17 | from common import errlog
|
18 | 18 |
|
| 19 | +from tools.diagnostics import with_color, CYAN, GREEN, RED |
19 | 20 | from tools.utils import WINDOWS
|
20 | 21 |
|
21 | 22 |
|
@@ -304,35 +305,41 @@ def compute_progress(self):
|
304 | 305 | with self.lock:
|
305 | 306 | val = f'[{int(self.progress_counter.value * 100 / self.num_tests)}%] '
|
306 | 307 | self.progress_counter.value += 1
|
307 |
| - return val |
| 308 | + return with_color(CYAN, val) |
308 | 309 |
|
309 | 310 | 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)}') |
311 | 313 | self.buffered_result = BufferedTestSuccess(test)
|
312 | 314 | self.test_result = 'success'
|
313 | 315 |
|
314 | 316 | 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)}') |
316 | 319 | self.buffered_result = BufferedTestExpectedFailure(test, err)
|
317 | 320 | self.test_result = 'expected failure'
|
318 | 321 |
|
319 | 322 | 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)}') |
321 | 325 | self.buffered_result = BufferedTestUnexpectedSuccess(test)
|
322 | 326 | self.test_result = 'unexpected success'
|
323 | 327 |
|
324 | 328 | 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)}") |
326 | 331 | self.buffered_result = BufferedTestSkip(test, reason)
|
327 | 332 | self.test_result = 'skipped'
|
328 | 333 |
|
329 | 334 | 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)}') |
331 | 337 | self.buffered_result = BufferedTestFailure(test, err)
|
332 | 338 | self.test_result = 'failed'
|
333 | 339 |
|
334 | 340 | 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)}') |
336 | 343 | self.buffered_result = BufferedTestError(test, err)
|
337 | 344 | self.test_result = 'errored'
|
338 | 345 |
|
|
0 commit comments