X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=kconfig_hardened_check%2Ftest_engine.py;h=e3c1c0d69daf7bdf701da2fb8ff4995e69a312b2;hb=f8e47e12ddf6b5c7b7562af6b85b8f65481e4b07;hp=433e5844e596f6c5122618116857f32cd107aca8;hpb=d6caae5328a051d33e43ffec040cae03d8f6a07f;p=kconfig-hardened-check.git diff --git a/kconfig_hardened_check/test_engine.py b/kconfig_hardened_check/test_engine.py index 433e584..e3c1c0d 100644 --- a/kconfig_hardened_check/test_engine.py +++ b/kconfig_hardened_check/test_engine.py @@ -15,7 +15,8 @@ import io import sys from collections import OrderedDict import json -from .engine import KconfigCheck, CmdlineCheck, VersionCheck, OR, AND, populate_with_data, perform_checks, override_expected_value +import inspect +from .engine import KconfigCheck, CmdlineCheck, SysctlCheck, VersionCheck, OR, AND, populate_with_data, perform_checks, override_expected_value class TestEngine(unittest.TestCase): @@ -26,6 +27,7 @@ class TestEngine(unittest.TestCase): config_checklist = [] config_checklist += [KconfigCheck('reason_1', 'decision_1', 'KCONFIG_NAME', 'expected_1')] config_checklist += [CmdlineCheck('reason_2', 'decision_2', 'cmdline_name', 'expected_2')] + config_checklist += [SysctlCheck('reason_3', 'decision_3', 'sysctl_name', 'expected_3')] # 2. prepare the parsed kconfig options parsed_kconfig_options = OrderedDict() @@ -35,25 +37,31 @@ class TestEngine(unittest.TestCase): parsed_cmdline_options = OrderedDict() parsed_cmdline_options['cmdline_name'] = 'expected_2' - # 4. prepare the kernel version + # 4. prepare the parsed sysctl options + parsed_sysctl_options = OrderedDict() + parsed_sysctl_options['sysctl_name'] = 'expected_3' + + # 5. prepare the kernel version kernel_version = (42, 43) - # 5. run the engine - self.run_engine(config_checklist, parsed_kconfig_options, parsed_cmdline_options, kernel_version) + # 6. run the engine + self.run_engine(config_checklist, parsed_kconfig_options, parsed_cmdline_options, parsed_sysctl_options, kernel_version) - # 6. check that the results are correct + # 7. check that the results are correct result = [] self.get_engine_result(config_checklist, result, 'json') self.assertEqual(... """ @staticmethod - def run_engine(checklist, parsed_kconfig_options, parsed_cmdline_options, kernel_version): + def run_engine(checklist, parsed_kconfig_options, parsed_cmdline_options, parsed_sysctl_options, kernel_version): # populate the checklist with data if parsed_kconfig_options: populate_with_data(checklist, parsed_kconfig_options, 'kconfig') if parsed_cmdline_options: populate_with_data(checklist, parsed_cmdline_options, 'cmdline') + if parsed_sysctl_options: + populate_with_data(checklist, parsed_sysctl_options, 'sysctl') if kernel_version: populate_with_data(checklist, kernel_version, 'version') @@ -61,14 +69,14 @@ class TestEngine(unittest.TestCase): perform_checks(checklist) # print the table with the results - print('TABLE:') + print(f'\n{inspect.stack()[1].function}():') + print('=' * 121) for opt in checklist: opt.table_print('verbose', True) # verbose mode, with_results print() print('=' * 121) # print the results in JSON - print('JSON:') result = [] for opt in checklist: result.append(opt.json_dump(True)) # with_results @@ -120,7 +128,7 @@ class TestEngine(unittest.TestCase): parsed_kconfig_options['CONFIG_NAME_9'] = '0' # 3. run the engine - self.run_engine(config_checklist, parsed_kconfig_options, None, None) + self.run_engine(config_checklist, parsed_kconfig_options, None, None, None) # 4. check that the results are correct result = [] @@ -163,7 +171,7 @@ class TestEngine(unittest.TestCase): parsed_cmdline_options['name_9'] = '0' # 3. run the engine - self.run_engine(config_checklist, None, parsed_cmdline_options, None) + self.run_engine(config_checklist, None, parsed_cmdline_options, None, None) # 4. check that the results are correct result = [] @@ -182,6 +190,49 @@ class TestEngine(unittest.TestCase): ["name_10", "cmdline", "is not off", "decision_10", "reason_10", "FAIL: is off, not found"]] ) + def test_simple_sysctl(self): + # 1. prepare the checklist + config_checklist = [] + config_checklist += [SysctlCheck('reason_1', 'decision_1', 'name_1', 'expected_1')] + config_checklist += [SysctlCheck('reason_2', 'decision_2', 'name_2', 'expected_2')] + config_checklist += [SysctlCheck('reason_3', 'decision_3', 'name_3', 'expected_3')] + config_checklist += [SysctlCheck('reason_4', 'decision_4', 'name_4', 'is not set')] + config_checklist += [SysctlCheck('reason_5', 'decision_5', 'name_5', 'is present')] + config_checklist += [SysctlCheck('reason_6', 'decision_6', 'name_6', 'is present')] + config_checklist += [SysctlCheck('reason_7', 'decision_7', 'name_7', 'is not off')] + config_checklist += [SysctlCheck('reason_8', 'decision_8', 'name_8', 'is not off')] + config_checklist += [SysctlCheck('reason_9', 'decision_9', 'name_9', 'is not off')] + config_checklist += [SysctlCheck('reason_10', 'decision_10', 'name_10', 'is not off')] + + # 2. prepare the parsed sysctl options + parsed_sysctl_options = OrderedDict() + parsed_sysctl_options['name_1'] = 'expected_1' + parsed_sysctl_options['name_2'] = 'UNexpected_2' + parsed_sysctl_options['name_5'] = '' + parsed_sysctl_options['name_7'] = '' + parsed_sysctl_options['name_8'] = 'off' + parsed_sysctl_options['name_9'] = '0' + + # 3. run the engine + self.run_engine(config_checklist, None, None, parsed_sysctl_options, None) + + # 4. check that the results are correct + result = [] + self.get_engine_result(config_checklist, result, 'json') + self.assertEqual( + result, + [["name_1", "sysctl", "expected_1", "decision_1", "reason_1", "OK"], + ["name_2", "sysctl", "expected_2", "decision_2", "reason_2", "FAIL: \"UNexpected_2\""], + ["name_3", "sysctl", "expected_3", "decision_3", "reason_3", "FAIL: is not found"], + ["name_4", "sysctl", "is not set", "decision_4", "reason_4", "OK: is not found"], + ["name_5", "sysctl", "is present", "decision_5", "reason_5", "OK: is present"], + ["name_6", "sysctl", "is present", "decision_6", "reason_6", "FAIL: is not present"], + ["name_7", "sysctl", "is not off", "decision_7", "reason_7", "OK: is not off, \"\""], + ["name_8", "sysctl", "is not off", "decision_8", "reason_8", "FAIL: is off"], + ["name_9", "sysctl", "is not off", "decision_9", "reason_9", "FAIL: is off, \"0\""], + ["name_10", "sysctl", "is not off", "decision_10", "reason_10", "FAIL: is off, not found"]] + ) + def test_complex_or(self): # 1. prepare the checklist config_checklist = [] @@ -191,12 +242,12 @@ class TestEngine(unittest.TestCase): KconfigCheck('reason_4', 'decision_4', 'NAME_4', 'expected_4'))] config_checklist += [OR(KconfigCheck('reason_5', 'decision_5', 'NAME_5', 'expected_5'), KconfigCheck('reason_6', 'decision_6', 'NAME_6', 'expected_6'))] - config_checklist += [OR(KconfigCheck('reason_6', 'decision_6', 'NAME_6', 'expected_6'), - KconfigCheck('reason_7', 'decision_7', 'NAME_7', 'is not set'))] - config_checklist += [OR(KconfigCheck('reason_8', 'decision_8', 'NAME_8', 'expected_8'), - KconfigCheck('reason_9', 'decision_9', 'NAME_9', 'is present'))] - config_checklist += [OR(KconfigCheck('reason_10', 'decision_10', 'NAME_10', 'expected_10'), - KconfigCheck('reason_11', 'decision_11', 'NAME_11', 'is not off'))] + config_checklist += [OR(KconfigCheck('reason_7', 'decision_7', 'NAME_7', 'expected_7'), + KconfigCheck('reason_8', 'decision_8', 'NAME_8', 'is not set'))] + config_checklist += [OR(KconfigCheck('reason_9', 'decision_9', 'NAME_9', 'expected_9'), + KconfigCheck('reason_10', 'decision_10', 'NAME_10', 'is present'))] + config_checklist += [OR(KconfigCheck('reason_11', 'decision_11', 'NAME_11', 'expected_11'), + KconfigCheck('reason_12', 'decision_12', 'NAME_12', 'is not off'))] # 2. prepare the parsed kconfig options parsed_kconfig_options = OrderedDict() @@ -206,11 +257,11 @@ class TestEngine(unittest.TestCase): parsed_kconfig_options['CONFIG_NAME_4'] = 'expected_4' parsed_kconfig_options['CONFIG_NAME_5'] = 'UNexpected_5' parsed_kconfig_options['CONFIG_NAME_6'] = 'UNexpected_6' - parsed_kconfig_options['CONFIG_NAME_9'] = 'UNexpected_9' - parsed_kconfig_options['CONFIG_NAME_11'] = 'really_not_off' + parsed_kconfig_options['CONFIG_NAME_10'] = 'UNexpected_10' + parsed_kconfig_options['CONFIG_NAME_12'] = 'really_not_off' # 3. run the engine - self.run_engine(config_checklist, parsed_kconfig_options, None, None) + self.run_engine(config_checklist, parsed_kconfig_options, None, None, None) # 4. check that the results are correct result = [] @@ -220,9 +271,9 @@ class TestEngine(unittest.TestCase): [["CONFIG_NAME_1", "kconfig", "expected_1", "decision_1", "reason_1", "OK"], ["CONFIG_NAME_3", "kconfig", "expected_3", "decision_3", "reason_3", "OK: CONFIG_NAME_4 is \"expected_4\""], ["CONFIG_NAME_5", "kconfig", "expected_5", "decision_5", "reason_5", "FAIL: \"UNexpected_5\""], - ["CONFIG_NAME_6", "kconfig", "expected_6", "decision_6", "reason_6", "OK: CONFIG_NAME_7 is not found"], - ["CONFIG_NAME_8", "kconfig", "expected_8", "decision_8", "reason_8", "OK: CONFIG_NAME_9 is present"], - ["CONFIG_NAME_10", "kconfig", "expected_10", "decision_10", "reason_10", "OK: CONFIG_NAME_11 is not off"]] + ["CONFIG_NAME_7", "kconfig", "expected_7", "decision_7", "reason_7", "OK: CONFIG_NAME_8 is not found"], + ["CONFIG_NAME_9", "kconfig", "expected_9", "decision_9", "reason_9", "OK: CONFIG_NAME_10 is present"], + ["CONFIG_NAME_11", "kconfig", "expected_11", "decision_11", "reason_11", "OK: CONFIG_NAME_12 is not off"]] ) def test_complex_and(self): @@ -234,12 +285,12 @@ class TestEngine(unittest.TestCase): KconfigCheck('reason_4', 'decision_4', 'NAME_4', 'expected_4'))] config_checklist += [AND(KconfigCheck('reason_5', 'decision_5', 'NAME_5', 'expected_5'), KconfigCheck('reason_6', 'decision_6', 'NAME_6', 'expected_6'))] - config_checklist += [AND(KconfigCheck('reason_8', 'decision_8', 'NAME_8', 'expected_8'), - KconfigCheck('reason_9', 'decision_9', 'NAME_9', 'is present'))] - config_checklist += [AND(KconfigCheck('reason_10', 'decision_10', 'NAME_10', 'expected_10'), - KconfigCheck('reason_11', 'decision_11', 'NAME_11', 'is not off'))] - config_checklist += [AND(KconfigCheck('reason_12', 'decision_12', 'NAME_12', 'expected_12'), - KconfigCheck('reason_13', 'decision_13', 'NAME_13', 'is not off'))] + config_checklist += [AND(KconfigCheck('reason_7', 'decision_7', 'NAME_7', 'expected_7'), + KconfigCheck('reason_8', 'decision_8', 'NAME_8', 'is present'))] + config_checklist += [AND(KconfigCheck('reason_9', 'decision_9', 'NAME_9', 'expected_9'), + KconfigCheck('reason_10', 'decision_10', 'NAME_10', 'is not off'))] + config_checklist += [AND(KconfigCheck('reason_11', 'decision_11', 'NAME_11', 'expected_11'), + KconfigCheck('reason_12', 'decision_12', 'NAME_12', 'is not off'))] # 2. prepare the parsed kconfig options parsed_kconfig_options = OrderedDict() @@ -249,13 +300,13 @@ class TestEngine(unittest.TestCase): parsed_kconfig_options['CONFIG_NAME_4'] = 'UNexpected_4' parsed_kconfig_options['CONFIG_NAME_5'] = 'UNexpected_5' parsed_kconfig_options['CONFIG_NAME_6'] = 'expected_6' - parsed_kconfig_options['CONFIG_NAME_8'] = 'expected_8' - parsed_kconfig_options['CONFIG_NAME_10'] = 'expected_10' - parsed_kconfig_options['CONFIG_NAME_11'] = '0' - parsed_kconfig_options['CONFIG_NAME_12'] = 'expected_12' + parsed_kconfig_options['CONFIG_NAME_7'] = 'expected_7' + parsed_kconfig_options['CONFIG_NAME_9'] = 'expected_9' + parsed_kconfig_options['CONFIG_NAME_10'] = '0' + parsed_kconfig_options['CONFIG_NAME_11'] = 'expected_11' # 3. run the engine - self.run_engine(config_checklist, parsed_kconfig_options, None, None) + self.run_engine(config_checklist, parsed_kconfig_options, None, None, None) # 4. check that the results are correct result = [] @@ -265,9 +316,54 @@ class TestEngine(unittest.TestCase): [["CONFIG_NAME_1", "kconfig", "expected_1", "decision_1", "reason_1", "OK"], ["CONFIG_NAME_3", "kconfig", "expected_3", "decision_3", "reason_3", "FAIL: CONFIG_NAME_4 is not \"expected_4\""], ["CONFIG_NAME_5", "kconfig", "expected_5", "decision_5", "reason_5", "FAIL: \"UNexpected_5\""], - ["CONFIG_NAME_8", "kconfig", "expected_8", "decision_8", "reason_8", "FAIL: CONFIG_NAME_9 is not present"], - ["CONFIG_NAME_10", "kconfig", "expected_10", "decision_10", "reason_10", "FAIL: CONFIG_NAME_11 is off"], - ["CONFIG_NAME_12", "kconfig", "expected_12", "decision_12", "reason_12", "FAIL: CONFIG_NAME_13 is off, not found"]] + ["CONFIG_NAME_7", "kconfig", "expected_7", "decision_7", "reason_7", "FAIL: CONFIG_NAME_8 is not present"], + ["CONFIG_NAME_9", "kconfig", "expected_9", "decision_9", "reason_9", "FAIL: CONFIG_NAME_10 is off"], + ["CONFIG_NAME_11", "kconfig", "expected_11", "decision_11", "reason_11", "FAIL: CONFIG_NAME_12 is off, not found"]] + ) + + def test_complex_nested(self): + # 1. prepare the checklist + config_checklist = [] + config_checklist += [AND(KconfigCheck('reason_1', 'decision_1', 'NAME_1', 'expected_1'), + OR(KconfigCheck('reason_2', 'decision_2', 'NAME_2', 'expected_2'), + KconfigCheck('reason_3', 'decision_3', 'NAME_3', 'expected_3')))] + config_checklist += [AND(KconfigCheck('reason_4', 'decision_4', 'NAME_4', 'expected_4'), + OR(KconfigCheck('reason_5', 'decision_5', 'NAME_5', 'expected_5'), + KconfigCheck('reason_6', 'decision_6', 'NAME_6', 'expected_6')))] + config_checklist += [OR(KconfigCheck('reason_7', 'decision_7', 'NAME_7', 'expected_7'), + AND(KconfigCheck('reason_8', 'decision_8', 'NAME_8', 'expected_8'), + KconfigCheck('reason_9', 'decision_9', 'NAME_9', 'expected_9')))] + config_checklist += [OR(KconfigCheck('reason_10', 'decision_10', 'NAME_10', 'expected_10'), + AND(KconfigCheck('reason_11', 'decision_11', 'NAME_11', 'expected_11'), + KconfigCheck('reason_12', 'decision_12', 'NAME_12', 'expected_12')))] + + # 2. prepare the parsed kconfig options + parsed_kconfig_options = OrderedDict() + parsed_kconfig_options['CONFIG_NAME_1'] = 'expected_1' + parsed_kconfig_options['CONFIG_NAME_2'] = 'UNexpected_2' + parsed_kconfig_options['CONFIG_NAME_3'] = 'expected_3' + parsed_kconfig_options['CONFIG_NAME_4'] = 'expected_4' + parsed_kconfig_options['CONFIG_NAME_5'] = 'UNexpected_5' + parsed_kconfig_options['CONFIG_NAME_6'] = 'UNexpected_6' + parsed_kconfig_options['CONFIG_NAME_7'] = 'UNexpected_7' + parsed_kconfig_options['CONFIG_NAME_8'] = 'expected_8' + parsed_kconfig_options['CONFIG_NAME_9'] = 'expected_9' + parsed_kconfig_options['CONFIG_NAME_10'] = 'UNexpected_10' + parsed_kconfig_options['CONFIG_NAME_11'] = 'UNexpected_11' + parsed_kconfig_options['CONFIG_NAME_12'] = 'expected_12' + + # 3. run the engine + self.run_engine(config_checklist, parsed_kconfig_options, None, None, None) + + # 4. 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", "OK"], + ["CONFIG_NAME_4", "kconfig", "expected_4", "decision_4", "reason_4", "FAIL: CONFIG_NAME_5 is not \"expected_5\""], + ["CONFIG_NAME_7", "kconfig", "expected_7", "decision_7", "reason_7", "OK: CONFIG_NAME_8 is \"expected_8\""], + ["CONFIG_NAME_10", "kconfig", "expected_10", "decision_10", "reason_10", "FAIL: \"UNexpected_10\""]] ) def test_version(self): @@ -291,7 +387,7 @@ class TestEngine(unittest.TestCase): kernel_version = (42, 43) # 4. run the engine - self.run_engine(config_checklist, parsed_kconfig_options, None, kernel_version) + self.run_engine(config_checklist, parsed_kconfig_options, None, None, kernel_version) # 5. check that the results are correct result = [] @@ -308,27 +404,35 @@ class TestEngine(unittest.TestCase): # 1. prepare the checklist 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')))] - 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')))] + CmdlineCheck('reason_2', 'decision_2', 'name_2', 'expected_2'), + SysctlCheck('reason_3', 'decision_3', 'name_3', 'expected_3'))] + config_checklist += [AND(KconfigCheck('reason_4', 'decision_4', 'NAME_4', 'expected_4'), + CmdlineCheck('reason_5', 'decision_5', 'name_5', 'expected_5'), + SysctlCheck('reason_6', 'decision_6', 'name_6', 'expected_6'))] - # 2. prepare the parsed cmdline options + # 2. prepare the parsed kconfig options + parsed_kconfig_options = OrderedDict() + parsed_kconfig_options['CONFIG_NAME_1'] = 'UNexpected_1' + + # 3. prepare the parsed cmdline options parsed_cmdline_options = OrderedDict() - parsed_cmdline_options['name_4'] = 'expected_4' - parsed_cmdline_options['name_6'] = 'UNexpected_6' + parsed_cmdline_options['name_2'] = 'expected_2' + parsed_cmdline_options['name_5'] = 'UNexpected_5' - # 3. run the engine - self.run_engine(config_checklist, None, parsed_cmdline_options, None) + # 4. prepare the parsed sysctl options + parsed_sysctl_options = OrderedDict() + parsed_sysctl_options['name_6'] = 'expected_6' - # 4. 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 json_result = [] self.get_engine_result(config_checklist, json_result, 'json') self.assertEqual( json_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: CONFIG_NAME_5 is not \"expected_5\""]] + [["CONFIG_NAME_1", "kconfig", "expected_1", "decision_1", "reason_1", "OK: name_2 is \"expected_2\""], + ["CONFIG_NAME_4", "kconfig", "expected_4", "decision_4", "reason_4", "FAIL: name_5 is not \"expected_5\""]] ) stdout_result = [] @@ -337,8 +441,8 @@ class TestEngine(unittest.TestCase): 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: CONFIG_NAME_5 is not \"expected_5\"\ +CONFIG_NAME_1 |kconfig| expected_1 |decision_1| reason_1 | \x1b[32mOK: name_2 is \"expected_2\"\x1b[0m\ +CONFIG_NAME_4 |kconfig| expected_4 |decision_4| reason_4 | \x1b[31mFAIL: name_5 is not \"expected_5\"\x1b[0m\ " ] ) @@ -348,18 +452,16 @@ name_4 |cmdline| expected_4 |decision_4| re stdout_result, [ "\ - <<< 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\ -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\ + <<< OR >>> | \x1b[32mOK: name_2 is \"expected_2\"\x1b[0m\n\ +CONFIG_NAME_1 |kconfig| expected_1 |decision_1| reason_1 | \x1b[31mFAIL: \"UNexpected_1\"\x1b[0m\n\ +name_2 |cmdline| expected_2 |decision_2| reason_2 | \x1b[32mOK\x1b[0m\n\ +name_3 |sysctl | expected_3 |decision_3| reason_3 | None\ "\ "\ - <<< 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\"\ + <<< AND >>> | \x1b[31mFAIL: name_5 is not \"expected_5\"\x1b[0m\n\ +CONFIG_NAME_4 |kconfig| expected_4 |decision_4| reason_4 | None\n\ +name_5 |cmdline| expected_5 |decision_5| reason_5 | \x1b[31mFAIL: \"UNexpected_5\"\x1b[0m\n\ +name_6 |sysctl | expected_6 |decision_6| reason_6 | \x1b[32mOK\x1b[0m\ " ] ) @@ -368,6 +470,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() @@ -377,40 +480,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) + # 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"]] )