X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=kconfig_hardened_check%2Ftest_engine.py;h=acb47b2544269bb20a36098b28ef7b8969df4279;hb=2082a3b1d5ecb4ce4f2426e8b55251c6e04003cf;hp=d04618d30b159042ae964a7e5197b89c3cb4742c;hpb=b6ff232ab90e97812b167a940a848fd2cd31e98d;p=kconfig-hardened-check.git diff --git a/kconfig_hardened_check/test_engine.py b/kconfig_hardened_check/test_engine.py index d04618d..acb47b2 100644 --- a/kconfig_hardened_check/test_engine.py +++ b/kconfig_hardened_check/test_engine.py @@ -79,7 +79,7 @@ class TestEngine(unittest.TestCase): @staticmethod 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}"' if result_type == 'json': @@ -91,7 +91,10 @@ class TestEngine(unittest.TestCase): stdout_backup = sys.stdout sys.stdout = captured_output for opt in checklist: - opt.table_print('verbose', True) # verbose mode, with_results + if result_type == 'stdout_verbose': + opt.table_print('verbose', True) # verbose mode, with_results + else: + opt.table_print(None, True) # normal mode, with_results sys.stdout = stdout_backup result.append(captured_output.getvalue()) @@ -303,7 +306,7 @@ class TestEngine(unittest.TestCase): ["CONFIG_NAME_4", "kconfig", "expected_4", "decision_4", "reason_4", "OK: version >= 42.43"]] ) - def test_verbose(self): + def test_stdout(self): # 1. prepare the checklist config_checklist = [] config_checklist += [OR(KconfigCheck('reason_1', 'decision_1', 'NAME_1', 'expected_1'), @@ -334,6 +337,17 @@ class TestEngine(unittest.TestCase): self.assertEqual( stdout_result, [ +"\ +CONFIG_NAME_1 |kconfig| expected_1 |decision_1| reason_1 | FAIL: is not found\ +name_4 |cmdline| expected_4 |decision_4| reason_4 | FAIL: is not found\ +" ] + ) + + stdout_result = [] + self.get_engine_result(config_checklist, stdout_result, 'stdout_verbose') + self.assertEqual( + stdout_result, + [ "\ <<< OR >>> | FAIL: is not found\n\ CONFIG_NAME_1 |kconfig| expected_1 |decision_1| reason_1 | FAIL: is not found\n\