X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=kconfig_hardened_check%2Ftest_engine.py;h=dce10390aa1502607fdd63ab90019cb1447ef6db;hb=e2ecf1ab64d1f4193eddff47df362afce2385c09;hp=531dfeead6763e9f5cb8e520d202123146c217ff;hpb=a161c6b03331da0711018c688549a0bae306e389;p=kconfig-hardened-check.git diff --git a/kconfig_hardened_check/test_engine.py b/kconfig_hardened_check/test_engine.py index 531dfee..dce1039 100644 --- a/kconfig_hardened_check/test_engine.py +++ b/kconfig_hardened_check/test_engine.py @@ -359,20 +359,24 @@ class TestEngine(unittest.TestCase): config_checklist = [] config_checklist += [OR(KconfigCheck('reason_1', 'decision_1', 'NAME_1', 'expected_1'), AND(CmdlineCheck('reason_2', 'decision_2', 'name_2', 'expected_2'), - KconfigCheck('reason_3', 'decision_3', 'NAME_3', 'expected_3')))] + SysctlCheck('reason_3', 'decision_3', 'name_3', 'expected_3')))] config_checklist += [AND(CmdlineCheck('reason_4', 'decision_4', 'name_4', 'expected_4'), OR(KconfigCheck('reason_5', 'decision_5', 'NAME_5', 'expected_5'), - CmdlineCheck('reason_6', 'decision_6', 'name_6', 'expected_6')))] + SysctlCheck('reason_6', 'decision_6', 'name_6', 'expected_6')))] # 2. prepare the parsed cmdline options parsed_cmdline_options = OrderedDict() parsed_cmdline_options['name_4'] = 'expected_4' - parsed_cmdline_options['name_6'] = 'UNexpected_6' - # 3. run the engine - self.run_engine(config_checklist, None, parsed_cmdline_options, None, None) + # 3. prepare the parsed sysctl options + parsed_sysctl_options = OrderedDict() + parsed_sysctl_options['name_3'] = 'UNexpected_3' + parsed_sysctl_options['name_6'] = 'UNexpected_6' - # 4. check that the results are correct + # 4. run the engine + self.run_engine(config_checklist, None, parsed_cmdline_options, parsed_sysctl_options, None) + + # 5. check that the results are correct json_result = [] self.get_engine_result(config_checklist, json_result, 'json') self.assertEqual( @@ -400,16 +404,16 @@ name_4 |cmdline| expected_4 |decision_4| re "\ <<< OR >>> | FAIL: is not found\n\ CONFIG_NAME_1 |kconfig| expected_1 |decision_1| reason_1 | FAIL: is not found\n\ - <<< AND >>> | FAIL: CONFIG_NAME_3 is not \"expected_3\"\n\ + <<< AND >>> | FAIL: name_3 is not \"expected_3\"\n\ name_2 |cmdline| expected_2 |decision_2| reason_2 | None\n\ -CONFIG_NAME_3 |kconfig| expected_3 |decision_3| reason_3 | FAIL: is not found\ +name_3 |sysctl | expected_3 |decision_3| reason_3 | FAIL: \"UNexpected_3\"\ "\ "\ <<< AND >>> | FAIL: CONFIG_NAME_5 is not \"expected_5\"\n\ name_4 |cmdline| expected_4 |decision_4| reason_4 | None\n\ <<< OR >>> | FAIL: is not found\n\ CONFIG_NAME_5 |kconfig| expected_5 |decision_5| reason_5 | FAIL: is not found\n\ -name_6 |cmdline| expected_6 |decision_6| reason_6 | FAIL: \"UNexpected_6\"\ +name_6 |sysctl | expected_6 |decision_6| reason_6 | FAIL: \"UNexpected_6\"\ " ] ) @@ -418,6 +422,7 @@ name_6 |cmdline| expected_6 |decision_6| re config_checklist = [] config_checklist += [KconfigCheck('reason_1', 'decision_1', 'NAME_1', 'expected_1')] config_checklist += [CmdlineCheck('reason_2', 'decision_2', 'name_2', 'expected_2')] + config_checklist += [SysctlCheck('reason_3', 'decision_3', 'name_3', 'expected_3')] # 2. prepare the parsed kconfig options parsed_kconfig_options = OrderedDict() @@ -427,40 +432,61 @@ name_6 |cmdline| expected_6 |decision_6| re parsed_cmdline_options = OrderedDict() parsed_cmdline_options['name_2'] = 'expected_2_new' - # 4. run the engine - self.run_engine(config_checklist, parsed_kconfig_options, parsed_cmdline_options, None, None) + # 4. prepare the parsed sysctl options + parsed_sysctl_options = OrderedDict() + parsed_sysctl_options['name_3'] = 'expected_3_new' - # 5. check that the results are correct + # 5. run the engine + self.run_engine(config_checklist, parsed_kconfig_options, parsed_cmdline_options, parsed_sysctl_options, None) + + # 6. check that the results are correct result = [] self.get_engine_result(config_checklist, result, 'json') self.assertEqual( result, [["CONFIG_NAME_1", "kconfig", "expected_1", "decision_1", "reason_1", "FAIL: \"expected_1_new\""], - ["name_2", "cmdline", "expected_2", "decision_2", "reason_2", "FAIL: \"expected_2_new\""]] + ["name_2", "cmdline", "expected_2", "decision_2", "reason_2", "FAIL: \"expected_2_new\""], + ["name_3", "sysctl", "expected_3", "decision_3", "reason_3", "FAIL: \"expected_3_new\""]] ) - # 6. override expected value and perform the checks again + # 7. override expected value and perform the checks again override_expected_value(config_checklist, "CONFIG_NAME_1", "expected_1_new") perform_checks(config_checklist) - # 7. check that the results are correct + # 8. check that the results are correct result = [] self.get_engine_result(config_checklist, result, 'json') self.assertEqual( result, [["CONFIG_NAME_1", "kconfig", "expected_1_new", "decision_1", "reason_1", "OK"], - ["name_2", "cmdline", "expected_2", "decision_2", "reason_2", "FAIL: \"expected_2_new\""]] + ["name_2", "cmdline", "expected_2", "decision_2", "reason_2", "FAIL: \"expected_2_new\""], + ["name_3", "sysctl", "expected_3", "decision_3", "reason_3", "FAIL: \"expected_3_new\""]] ) - # 8. override expected value and perform the checks again + # 9. override expected value and perform the checks again override_expected_value(config_checklist, "name_2", "expected_2_new") perform_checks(config_checklist) - # 9. check that the results are correct + # 10. check that the results are correct + result = [] + self.get_engine_result(config_checklist, result, 'json') + self.assertEqual( + result, + [["CONFIG_NAME_1", "kconfig", "expected_1_new", "decision_1", "reason_1", "OK"], + ["name_2", "cmdline", "expected_2_new", "decision_2", "reason_2", "OK"], + ["name_3", "sysctl", "expected_3", "decision_3", "reason_3", "FAIL: \"expected_3_new\""]] + ) + + # 11. override expected value and perform the checks again + override_expected_value(config_checklist, "name_3", "expected_3_new") + perform_checks(config_checklist) + + # 12. check that the results are correct result = [] self.get_engine_result(config_checklist, result, 'json') self.assertEqual( result, [["CONFIG_NAME_1", "kconfig", "expected_1_new", "decision_1", "reason_1", "OK"], - ["name_2", "cmdline", "expected_2_new", "decision_2", "reason_2", "OK"]] + ["name_2", "cmdline", "expected_2_new", "decision_2", "reason_2", "OK"], + ["name_3", "sysctl", "expected_3_new", "decision_3", "reason_3", "OK"]] )