From f9f4c78101eaa7fc57d7ab376ceea2a3e1bcbcf8 Mon Sep 17 00:00:00 2001 From: Rishabh Dave Date: Mon, 5 Oct 2020 20:13:07 +0530 Subject: [PATCH] vstart_runner: omit result line only when testcases are run one by one vstart_runner omits the result line ("Ran X tests in Y") generated by unittest unconditionally. Don't do so when vstart_runner triggers entire test module at once. Signed-off-by: Rishabh Dave --- qa/tasks/vstart_runner.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/qa/tasks/vstart_runner.py b/qa/tasks/vstart_runner.py index 9ece26f3460e..2fd039a73278 100644 --- a/qa/tasks/vstart_runner.py +++ b/qa/tasks/vstart_runner.py @@ -1341,6 +1341,7 @@ def clear_old_log(): class LogStream(object): def __init__(self): self.buffer = "" + self.omit_result_lines = False def _del_result_lines(self): """ @@ -1348,8 +1349,9 @@ class LogStream(object): vstart_runner.py will do it for itself since it runs tests in a testsuite one by one. """ - self.buffer = re.sub('-'*70+'\nran [0-9]* test in [0-9.]*s\n*', - '', self.buffer, flags=re.I) + if self.omit_result_lines: + self.buffer = re.sub('-'*70+'\nran [0-9]* test in [0-9.]*s\n*', + '', self.buffer, flags=re.I) self.buffer = re.sub('failed \(failures=[0-9]*\)\n', '', self.buffer, flags=re.I) self.buffer = self.buffer.replace('OK\n', '') -- 2.47.3