Commit d58e674e by Alexander Popov

test_engine: support the non-verbose output mode in get_engine_result()

parent 7e625e31
...@@ -79,7 +79,7 @@ class TestEngine(unittest.TestCase): ...@@ -79,7 +79,7 @@ class TestEngine(unittest.TestCase):
@staticmethod @staticmethod
def get_engine_result(checklist, result, result_type): def get_engine_result(checklist, result, result_type):
assert(result_type in ('json', 'stdout')), \ assert(result_type in ('json', 'stdout', 'stdout_verbose')), \
f'invalid result type "{result_type}"' f'invalid result type "{result_type}"'
if result_type == 'json': if result_type == 'json':
...@@ -91,7 +91,10 @@ class TestEngine(unittest.TestCase): ...@@ -91,7 +91,10 @@ class TestEngine(unittest.TestCase):
stdout_backup = sys.stdout stdout_backup = sys.stdout
sys.stdout = captured_output sys.stdout = captured_output
for opt in checklist: for opt in checklist:
if result_type == 'stdout_verbose':
opt.table_print('verbose', True) # verbose mode, with_results opt.table_print('verbose', True) # verbose mode, with_results
else:
opt.table_print(None, True) # normal mode, with_results
sys.stdout = stdout_backup sys.stdout = stdout_backup
result.append(captured_output.getvalue()) result.append(captured_output.getvalue())
...@@ -330,7 +333,7 @@ class TestEngine(unittest.TestCase): ...@@ -330,7 +333,7 @@ class TestEngine(unittest.TestCase):
) )
stdout_result = [] stdout_result = []
self.get_engine_result(config_checklist, stdout_result, 'stdout') self.get_engine_result(config_checklist, stdout_result, 'stdout_verbose')
self.assertEqual( self.assertEqual(
stdout_result, stdout_result,
[ [
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment