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 <ridave@redhat.com>

diff --git a/qa/tasks/vstart_runner.py b/qa/tasks/vstart_runner.py
index 9ece26f3460e6b883b5c84a21dcca343bf3efb15..2fd039a732783bb08508137d02e22cea094e53ab 100644 (file)
--- 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', '')