tools/psoc6/run_test_plan.py: WIP. FIXUP.

Signed-off-by: jaenrig-ifx <enriquezgarcia.external@infineon.com>

Author: jaenrig-ifx

tools/psoc6/run_test_plan.py

@@ -377,11 +377,6 @@ def update_upon_fail(cls, test_name: str, max_retries: int) -> None:
             # else decrease a retry
             logging.debug("Decreasing retry for test: {}".format(test_name))
             cls.test_retry_list[test_retry_index].retries -= 1
-            # if cls.test_retry_list[test_retry_index].retries == 0:
-            #     # Remove from the list
-            #     logging.debug("Removing test from retry list: {}".format(test_name))
-            #     test_retry_obj = cls.test_retry_list[test_retry_index]
-            #     cls.test_retry_list.remove(test_retry_obj)
 
     @classmethod
     def update_upon_success(cls, test_name: str) -> None:
@@ -402,17 +397,6 @@ def get_retry_test_list(cls, test_list: list[TestRunner]) -> list[TestRunner]:
                     retry_test_list.append(test)
         return retry_test_list
 
-    # @classmethod
-    # def get_retry_expired_test_list(cls, test_list: list[TestRunner]) -> list[TestRunner]:
-    #    retry_test_name_list = cls.get_test_name_retry_list()
-    #    logging.debug(f"Getting fail test list for names: {retry_test_name_list}")
-    #    fail_test_list = []
-    #    for test in test_list:
-    #         for retry in cls.
-    #         if test.name in retry_test_name_list:
-    #             fail_test_list.append(test)
-    #     return fail_test_list
-
     """
     Private methods
     """
@@ -456,7 +440,8 @@ def test_plan_info(self, board, test_plan_file, hil_devs_file):
         )
         print(f"{TestPlanLogger.blue_on}> board        : {board}{TestPlanLogger.color_off}")
         print(f"test plan file : {os.path.relpath(test_plan_file)}")
-        print(f"hil devs file  : {os.path.relpath(hil_devs_file)}")
+        if hil_devs_file:
+            print(f"hil devs file  : {os.path.relpath(hil_devs_file)}")
         print(
             f"{TestPlanLogger.blue_on}"
             + "#" * TestPlanLogger.decorator_line_len
@@ -550,12 +535,19 @@ def test_summary_info(self, pass_test_name_list, fail_test_name_list, skip_test_
 
 
 class TestPlanRunner:
-    def __init__(self, test_plan_file, hil_devs_file, max_retries=0):
+    def __init__(
+        self, test_plan_file, hil_devs_file, max_retries=0, dut_port=None, stub_port=None
+    ):
         self.test_plan_file = test_plan_file
         self.hil_devs_file = hil_devs_file
         self.max_retries = max_retries
         self.logger = TestPlanLogger()
 
+        self.dut_port = dut_port
+        self.stub_port = stub_port
+        self.direct_mode = True if (self.dut_port is not None) else False
+        print("Direct mode:", self.direct_mode)
+
     def run(self, board, test_name_list=[]):
         test_list = self.get_test_list(test_name_list)
 
@@ -624,6 +616,11 @@ def get_ports_for_role(test, board, device_role):
         dut_port = None
         stub_port = None
 
+        if self.direct_mode:
+            dut_port = self.dut_port
+            stub_port = self.stub_port
+            return dut_port, stub_port
+
         dut_port_list = get_ports_for_role(test, board, TestRunner.DeviceRole.DUT)
 
         if not dut_port_list:
@@ -715,13 +712,32 @@ def parse(self):
         return args
 
     def set_validate_args(self, args):
+        if args.hil_devs:
+            args.hil_devs = os.path.abspath(args.hil_devs)
+            if args.board is None:
+                self.tests_parser.error("--board is required when --hil-devs is provided")
+
+            if args.dut_port or args.stub_port:
+                self.tests_parser.error(
+                    "--dut-port and --stub-port are not supported when --hil-devs is provided"
+                )
+        else:
+            if args.board is not None:
+                self.tests_parser.error("--hil-devs is required when --board is provided")
+
+            # If the ports are not provide, the default values are set.
+            if args.dut_port is None:
+                args.dut_port = "/dev/ttyACM0"
+
+            if args.stub_port is None:
+                args.stub_port = "/dev/ttyACM1"
+
         if args.test_plan is None:
             args.test_plan = os.path.abspath(
                 os.path.join(os.path.abspath(os.path.dirname(__file__)), "test-plan.yml")
             )
         else:
             args.test_plan = os.path.abspath(args.test_plan)
-        args.hil_devs = os.path.abspath(args.hil_devs)
 
         if args.mpy_root_dir is None:
             run_test_plan_script_dir = os.path.abspath(os.path.dirname(__file__))
@@ -735,7 +751,12 @@ def set_validate_args(self, args):
 if __name__ == "__main__":
     test_parser = TestPlanParser()
     parser_args = test_parser.parse()
+    print(parser_args)
     test_plan_runner = TestPlanRunner(
-        parser_args.test_plan, parser_args.hil_devs, parser_args.max_retries
+        parser_args.test_plan,
+        parser_args.hil_devs,
+        parser_args.max_retries,
+        parser_args.dut_port,
+        parser_args.stub_port,
     )
     test_plan_runner.run(parser_args.board, parser_args.test_suite)