test_engine: add test_complex_nested()

[kconfig-hardened-check.git] / kconfig_hardened_check / engine.py

diff --git a/kconfig_hardened_check/engine.py b/kconfig_hardened_check/engine.py
index 99ce06547c8e97b8d20b4e872c01329f9aaeb268..4fdc222e7e8ac3d9fec6a2cf0a3c60c411f8c918 100644 (file)
--- a/kconfig_hardened_check/engine.py
+++ b/kconfig_hardened_check/engine.py
@@ -15,17 +15,16 @@ GREEN_COLOR = '\x1b[32m'
 RED_COLOR = '\x1b[31m'
 COLOR_END = '\x1b[0m'
 
-def colorize_result(input):
-
-    if input.startswith('OK'):
+def colorize_result(input_text):
+    if input_text is None:
+        return input_text
+    if input_text.startswith('OK'):
         color = GREEN_COLOR
-    elif input.startswith('FAIL:'):
+    elif input_text.startswith('FAIL:'):
         color = RED_COLOR
     else:
-        assert(False), f'unexpected result "{input}"'
-    colored_result = f'{color}{input}{COLOR_END}'
-
-    print(f'| {colored_result}', end='')  
+        assert(False), f'unexpected result "{input_text}"'
+    return f'{color}{input_text}{COLOR_END}'
 
 
 class OptCheck:
@@ -94,7 +93,7 @@ class OptCheck:
     def table_print(self, _mode, with_results):
         print(f'{self.name:<40}|{self.type:^7}|{self.expected:^12}|{self.decision:^10}|{self.reason:^18}', end='')
         if with_results:
-            colorize_result(self.result)
+            print(f'| {colorize_result(self.result)}', end='')
 
     def json_dump(self, with_results):
         dump = [self.name, self.type, self.expected, self.decision, self.reason]
@@ -153,7 +152,7 @@ class VersionCheck:
         ver_req = f'kernel version >= {self.ver_expected[0]}.{self.ver_expected[1]}'
         print(f'{ver_req:<91}', end='')
         if with_results:
-            colorize_result(self.result)
+            print(f'| {colorize_result(self.result)}', end='')
 
 
 class ComplexOptCheck:
@@ -183,8 +182,7 @@ class ComplexOptCheck:
         if mode == 'verbose':
             print(f'    {"<<< " + self.__class__.__name__ + " >>>":87}', end='')
             if with_results:
-                colorize_result(self.result)
-
+                print(f'| {colorize_result(self.result)}', end='')
             for o in self.opts:
                 print()
                 o.table_print(mode, with_results)
@@ -192,10 +190,7 @@ class ComplexOptCheck:
             o = self.opts[0]
             o.table_print(mode, False)
             if with_results:
-                 colorize_result(self.result)
-
-
-
+                print(f'| {colorize_result(self.result)}', end='')
 
     def json_dump(self, with_results):
         dump = self.opts[0].json_dump(False)