Making use of current_tc_no instead of sharing it to global

Author: mahbd

Framework/MainDriverApi.py

@@ -950,9 +950,6 @@ def run_test_case(
     browserDriver=None,
 ):
     try:
-        prev_zeuz_tc_logs = shared.Get_Shared_Variables("zeuz_tc_logs")
-        prev_zeuz_tc_logs['current_test_case_id'] = TestCaseID
-        shared.Set_Shared_Variables("zeuz_tc_logs", prev_zeuz_tc_logs, pretty=False, print_variable=False)
         TestCaseStartTime = time.time()
         test_case = str(TestCaseID).replace("#", "no")
         CommonUtil.current_tc_no = test_case
@@ -972,6 +969,7 @@ def run_test_case(
             shared.Set_Shared_Variables("zeuz_prettify_limit", 500)
             CommonUtil.prettify_limit = 500
 
+        shared.Set_Shared_Variables("zeuz_tc_logs", {"errors": []}, pretty=False, print_variable=False)
         shared.Set_Shared_Variables("zeuz_attachments_dir", (Path(temp_ini_file).parent/"attachments").__str__())
         if not shared.Test_Shared_Variables("element_wait"):
             shared.Set_Shared_Variables("element_wait", 10)
@@ -1805,8 +1803,6 @@ def download_or_copy(attachment):
 # main function
 def main(device_dict, all_run_id_info):
     try:
-        # Set TC logs
-        shared.Set_Shared_Variables("zeuz_tc_logs", {"errors": []}, print_variable=False, pretty=False)
         # get module info
         sModuleInfo = inspect.currentframe().f_code.co_name + " : " + MODULE_NAME
 
@@ -1949,7 +1945,6 @@ def main(device_dict, all_run_id_info):
 
             shared.Set_Shared_Variables("run_id", run_id)
             shared.Set_Shared_Variables("node_id", CommonUtil.MachineInfo().getLocalUser())
-            shared.Set_Shared_Variables("zeuz_tc_logs", {"errors": []}, print_variable=False, pretty=False)
 
             send_log_file_only_for_fail = ConfigModule.get_config_value("RunDefinition", "upload_log_file_only_for_fail")
             send_log_file_only_for_fail = False if send_log_file_only_for_fail.lower() == "false" else True

Framework/Utilities/CommonUtil.py

@@ -707,20 +707,18 @@ def ExecLog(
                 try:
                     from Framework.Built_In_Automation.Shared_Resources import BuiltInFunctionSharedResources as shared
                     zeuz_tc_logs = shared.Get_Shared_Variables("zeuz_tc_logs")
-                    if not zeuz_tc_logs or not isinstance(zeuz_tc_logs, dict):
-                        zeuz_tc_logs = {"errors": []}
-                    now = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-                    test_case_id = zeuz_tc_logs.get("current_test_case_id", 'unknown')
-                    error_entry = {
-                        "step": int(current_step_no),
-                        "action": int(current_action_no),
-                        "module": sModuleInfo,
-                        "message": sDetails,
-                        "test_case_id": test_case_id,
-                        "timestamp": now
-                    }
-                    zeuz_tc_logs["errors"].append(error_entry)
-                    shared.Set_Shared_Variables("zeuz_tc_logs", zeuz_tc_logs, print_variable=False, pretty=False)
+                    if zeuz_tc_logs and isinstance(zeuz_tc_logs, dict):
+                        now = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+                        error_entry = {
+                            "step": int(current_step_no),
+                            "action": int(current_action_no),
+                            "module": sModuleInfo,
+                            "message": sDetails,
+                            "test_case_id": current_tc_no,
+                            "timestamp": now
+                        }
+                        zeuz_tc_logs["errors"].append(error_entry)
+                        shared.Set_Shared_Variables("zeuz_tc_logs", zeuz_tc_logs, print_variable=False, pretty=False)
                 except:
                     pass