holado 0.10.0__py3-none-any.whl → 0.10.2__py3-none-any.whl

holado/common/context/session_context.py

@@ -295,15 +295,16 @@ class SessionContext(Context):
             scenario_context = ScenarioContext(scenario)
             self.get_feature_context().add_scenario(scenario_context)
             
-            # Set variable with scenario context instance
-            self.get_scenario_context().get_variable_manager().register_variable("SCENARIO_CONTEXT", self.get_scenario_context())
-            
-            # Report
+            # Report: create scenario report
             try:
                 self.report_manager.before_scenario(scenario_context, scenario)
             except:
                 logger.exception(f"{log_prefix}Error while updating report before scenario")
             
+            # Set variable with scenario context instance
+            # Note: must be after scenario report creation
+            self.get_scenario_context().get_variable_manager().register_variable("SCENARIO_CONTEXT", self.get_scenario_context())
+            
             # Behave context
             try:
                 self.behave_manager.before_scenario()
@@ -336,7 +337,7 @@ class SessionContext(Context):
             category_validation, status_validation, step_failed, step_number = ReportManager.get_current_scenario_status_information(scenario)
             if status_validation != "Passed":
                 msg_list = []
-                category_str = f" ({category_validation})" if category_validation else ""
+                category_str = f" => {category_validation}" if category_validation else ""
                 if step_failed is not None:
                     msg_list.append(f"Scenario {status_validation}{category_str}:  [scenario in {scenario.filename} at l.{scenario.line} - step {step_number} (l.{step_failed.line})]")
                 else:

{holado-0.10.0.dist-info → holado-0.10.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: holado
-Version: 0.10.0
+Version: 0.10.2
 Summary: HolAdo framework
 Project-URL: Homepage, https://gitlab.com/holado_framework/python
 Project-URL: Issues, https://gitlab.com/holado_framework/python/-/issues

{holado-0.10.0.dist-info → holado-0.10.2.dist-info}/RECORD

@@ -4,7 +4,7 @@ holado/common/__init__.py,sha256=ZjXM-FRQgnfzRNXqcvJOGewDHVRR-U5-ugStSs8U2Xs,152
 holado/common/context/__init__.py,sha256=3jJBLm8myrYF9jbdV1EhIA6BtnlmjX33eeoDpTzwmLA,1604
 holado/common/context/context.py,sha256=MV8A6JSpUcTcfia_QzjyDLybQC50rZ-NA0ffotnHXQY,11994
 holado/common/context/service_manager.py,sha256=LaCn8ukE1aqJynmwoexAYj5hCkdb_F3hXRtUBGqorUE,14087
-holado/common/context/session_context.py,sha256=dw4ozOn3o7EZwyfa_luMXLis5BO1z2HpmP91-GFKZLc,23391
+holado/common/context/session_context.py,sha256=IWxkeYnMSVImNyamTd3PXZSFIkXY96qFyAlC1y8s0J4,23475
 holado/common/handlers/__init__.py,sha256=d0KDUpaAAw1eBXyX08gaRh4RECnJlXjYQ0TcU-Ndicc,1372
 holado/common/handlers/enums.py,sha256=ieqKVoukEiNyfE3KrKmMOImdbFS1ocUMud8JHe2xNLs,1662
 holado/common/handlers/object.py,sha256=rDaav8zHTYfKVEaLtEdeXMxYXATGVcs2a7um1f5MvCs,7205
@@ -14,7 +14,7 @@ holado/common/tools/gc_manager.py,sha256=TjQg7MisGRhxuiQ22hB3IuqNhnWCVEWpU253-rO
 holado_ais/__init__.py,sha256=Mudcgu_7p1hBDBs6LpSz757H4haB0yLHgT70sznG82c,1807
 holado_ais/ais/MaritimeIdentificationDigits.csv,sha256=r-uHt4wOvxlbA26af9e-N3BKbuiMf6ia3PN0ZGfYk2A,8547
 holado_ais/ais/ais_manager.py,sha256=QvN94JoUBbSXT08HABl2FNsAVOM-YCmQO5tN9COg6Rc,6496
-holado_ais/ais/ais_messages.py,sha256=ppJQOP4L0CAYlG5AFESeDLziN9aK2Q92tXF-wZ6Xkl0,17520
+holado_ais/ais/ais_messages.py,sha256=J-GZJAY2RZpSS3OwzQJc6B_HsmdtRXLAcbfaP9APbUA,17414
 holado_ais/ais/ais_payload.py,sha256=mdOa_4JIbkFLK4_KUmQF5jUt1nLxvZhmIcqK8i-YY6w,1791
 holado_ais/ais/enums.py,sha256=bsqfJVg65fWiJwL_VlSKwKgTY0pLoDcI4T06aEOcQnw,1108
 holado_ais/ais/patch_pyais.py,sha256=M4Fa8GZubXx4auRsk5I1yQPC40IR1p-1iVZIc4PXFfk,49850
@@ -126,7 +126,7 @@ holado_core/common/tables/comparators/table_with_header_comparator.py,sha256=j7B
 holado_core/common/tables/converters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 holado_core/common/tables/converters/table_converter.py,sha256=PD7NJoxtejpr4aS1l3YKcXW1aEn1xBxdi4Ljs5G7R4g,10251
 holado_core/common/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-holado_core/common/tools/path_manager.py,sha256=27kLsvS2PfbZufG6P7T_-7N9Dh4dY3wgSZUwjM6ta_A,10876
+holado_core/common/tools/path_manager.py,sha256=XeQ8tS2S5XZn3L65LYXsOhNDe166uO8X2sxnwXqZbVE,10932
 holado_core/common/tools/string_tools.py,sha256=bQuMlI_yS7OoSPFL7qyfyXkrnjC8xHVpIsfmEC6JxhI,5590
 holado_core/common/tools/tools.py,sha256=zkDz7u8S_02bfyN6K-p7-Ey_SkDxzu9DJljnczY0OAo,9683
 holado_core/common/tools/comparators/comparator.py,sha256=K4LcXIRORHX5vkmDibI6P6Bu1L-6Xezb63ZzzOMKrWY,6812
@@ -302,7 +302,7 @@ holado_keycloak/tools/keycloak/keycloak_client.py,sha256=QXAsf9rF0pKq1dHhXeZFZOx
 holado_logging/__init__.py,sha256=erlTOOiI7SVryt3P6X3F2cEvdXflD85su8faAsTMN1Y,2259
 holado_logging/common/logging/holado_logger.py,sha256=FB5J_YbG41FGljAywMdCPVFJ2BdpMBS8AWPsT9B52S8,3160
 holado_logging/common/logging/log_config.py,sha256=u6Ax3S1TdBAzeUD3DAcw5WXPYEJeiQie7T_x_K6ZKeo,7049
-holado_logging/common/logging/log_manager.py,sha256=gq92IAfnKEX-GKUHexNVgEI0UUrUdiWaC5GLcSTAaUE,13604
+holado_logging/common/logging/log_manager.py,sha256=5dHaqtZlcB78YE8Xk_7KiSd_-toOQFLVIEWBNoMseKI,15477
 holado_multitask/__init__.py,sha256=EwuwiBmp8ICbPZ8CKPju8tHRTh2rG68PB_wGXczY9rw,2143
 holado_multitask/multiprocessing/function_process.py,sha256=HFXjpnzWed5J1tjmWMQyRx8AGcY6D1laegHqZ5j1dco,4550
 holado_multitask/multiprocessing/periodic_function_process.py,sha256=ubbdm2XSwjBGuDDXWX2b-lo_Abkivh4Blj9C8axsa4o,6779
@@ -318,7 +318,7 @@ holado_multitask/multithreading/periodicfunctionthreaded.py,sha256=PCBKpbOIThNGL
 holado_multitask/multithreading/thread.py,sha256=dKgw1301nTv-8g7y29ecza9ZB5nhbAKCYs1p4KdmLUQ,9376
 holado_multitask/multithreading/threadsmanager.py,sha256=5a-kV8t0-lwL6a9vCLL3_Oi-i67epcqOWWBz6vIJFEU,8462
 holado_multitask/multithreading/timer.py,sha256=77tI9WITN2CpQoY82SUYinoGzfx_stpqf2fRLUI1Itk,2638
-holado_multitask/multithreading/context/thread_context.py,sha256=pGcySQnqx92NIaVT64Ra3gIV7BpgBFfEy3N8PYTCOlI,3570
+holado_multitask/multithreading/context/thread_context.py,sha256=EWn8zqQZgLlnNhgMsBLULUke3J1VFLtdMR-Jukpvfiw,3773
 holado_multitask/multithreading/reflection/inspect.py,sha256=yntSXI6YEZDBfqoDnB0KS6HGxs__qTQFwF6FLUDZqCI,2137
 holado_multitask/multithreading/reflection/sys.py,sha256=1Q7hX9nddjqUvfn-k39SuPQhwLjXJmB9gegV6vNM534,1558
 holado_multitask/multithreading/reflection/traceback.py,sha256=Bnq-Xp0aA3D4kYtb7JJyXNASw3iU35WRSePredxWziQ,1891
@@ -351,7 +351,7 @@ holado_python/common/tools/comparators/type_comparator.py,sha256=EePE-LrqUeICEQP
 holado_python/standard_library/csv.py,sha256=G98oLsgovghpiQf4k06bUlXVvLy_D5H9qTK8e68UdcM,8937
 holado_python/standard_library/hashlib.py,sha256=5hMcHxc4BR4G0uNRqezTonflH_AFSLQum37Kqv1rRSU,4179
 holado_python/standard_library/multiprocessing.py,sha256=vThmJzdDTtdFyGUL3i3evmt2JBUK-jrorKbEtQ7TSFU,2786
-holado_python/standard_library/queue.py,sha256=RIFid85_CMFmanpt61LSaYqeHdlFwAuhcpBhxgyWj_o,3059
+holado_python/standard_library/queue.py,sha256=1iSXGfM4VVYZ9T9nPGholGAxxzku6MmxrTkStofxr0E,3058
 holado_python/standard_library/typing.py,sha256=8F9Iolh-c9GbDGlNr3V6uPdTEhSBdkLQu46oVwHPYKk,7693
 holado_python/standard_library/socket/blocking_socket.py,sha256=d7LnOoHY8k6WW4Zzy54AITw4-QDxaXTfXtWUCBBWfI8,10366
 holado_python/standard_library/socket/echo_server.py,sha256=ntApbwcckiEEBw-qjE487An81i4IEVFRPkoFbUrcCL4,1793
@@ -363,8 +363,8 @@ holado_python/standard_library/ssl/resources/certificates/NOTES.txt,sha256=GlPGG
 holado_python/standard_library/ssl/resources/certificates/localhost.crt,sha256=iLmZpDuOQVawUlbZkb72g2-uv1c4SAmRJOrm4Th5anY,1123
 holado_python/standard_library/ssl/resources/certificates/localhost.key,sha256=lP2NCvB9mr2E5sk8whA8FyQRcyU6H7sdWkJeKz80Hyc,1704
 holado_python/standard_library/ssl/resources/certificates/rootCACert.pem,sha256=ECQDZ8OHRfqpZHCu6JRLMUjiONaPIhKZQF0-kidVrWQ,1424
-holado_python/standard_library/ssl/resources/certificates/tcpbin.crt,sha256=fNTwFb1YbCrDS6217atgX9wMP7xEAo3-POIVaWC_00A,1237
-holado_python/standard_library/ssl/resources/certificates/tcpbin.key,sha256=puwUXC55YMr8AmXA77WiqYElt-JDYfhDKP8l6iELjd4,1704
+holado_python/standard_library/ssl/resources/certificates/tcpbin.crt,sha256=vD18qCn_hEkCOhFCiTudZnPaQ4huFMZVpA0PMChJv4c,1237
+holado_python/standard_library/ssl/resources/certificates/tcpbin.key,sha256=eQ2wHYKJkQfKHVDYA49pvtRIZvxuKonUHx54-05YXV4,1704
 holado_python/tests/behave/steps/__init__.py,sha256=TWEk-kBTTDHi9I4nuu48nufmNMdZ9FHAhPZv0A_cWzc,1661
 holado_python/tests/behave/steps/convert_steps.py,sha256=bZqRvJVp_u6fSPpdu4ne9NwVyZmui7R-AVdO2-H-I1A,2728
 holado_python/tests/behave/steps/iterable_steps.py,sha256=f4vGIWBH8Qnjq69Q-ZBluYyctQ8SKauazTc41dsktZA,4041
@@ -392,19 +392,19 @@ holado_redis/tools/redis/TODO.txt,sha256=cmFyx6qS6_FgL1Ph0OWRsWch6MQaklfv1j0qBO2
 holado_redis/tools/redis/redis_client.py,sha256=KWuOrnwTcwt5xkD3rtI_l07v164Y_bsoo1kE0IGzqaQ,8316
 holado_redis/tools/redis/redis_manager.py,sha256=tMO0XrCZTCfGdByFfgWXk9R-I_TUPLO9wXMQf8yCYcQ,1814
 holado_report/__init__.py,sha256=3wtu5g9d4d-AICmLZclPQrw2MS-FJL9CyiVO1n2MYWA,1868
-holado_report/campaign/campaign_manager.py,sha256=Py5aAGc-6rJb1FlDsUJ7EwyrGy0DBEXLPTJzR7yBMe8,8693
+holado_report/campaign/campaign_manager.py,sha256=fZtxvtFc7_BZm3KGZNMYh0p8SJ-znEX89MlEY6Gp3aE,8748
 holado_report/report/execution_historic.py,sha256=M4lYoZwyrSivRa17Q39GOAgROnr0oBvIZX5BNcO5Mnc,6951
-holado_report/report/report_manager.py,sha256=VOA9ABV3DAGf5Q5_eNPVJ3oJndiZSXGI8SKg6uP-Sq0,14713
+holado_report/report/report_manager.py,sha256=Xsiw8b5OW4QhMlyKSLMtP9fLydR-akzFkMkyy3bZtts,16272
 holado_report/report/analyze/execution_historic_manager.py,sha256=FMKKPguXOvWNxjF7Q8DodHHsH-2ci9pFzrTV41B8nL4,4556
 holado_report/report/analyze/scenario_duration_manager.py,sha256=Preaxu83qFKGfbvQnzolhSXztZ4i5Zo_Bnxx8tNA80Q,12468
 holado_report/report/builders/detailed_scenario_failed_report_builder.py,sha256=hOXxHYniL9mpN-U7YTW5xVEaE4Z-GlPq8ltT_iNJan4,7892
-holado_report/report/builders/failure_report_builder.py,sha256=jbw2Y1oEZQdk1i1PdbhQqbG8i3AuIlOmVRx3M598BTA,6532
+holado_report/report/builders/failure_report_builder.py,sha256=WLLlLgLbEyYJNENEoxSkQQSf11DDoKpSa4kdaq7eV8U,6533
 holado_report/report/builders/json_execution_historic_report_builder.py,sha256=M7OGUvkqNRTG5Td7fO96tv1SJEzRzjm0pl1W02v052E,5929
 holado_report/report/builders/report_builder.py,sha256=5qlhxbdTkSN7p9q6EADkpHQGPDVEHquIhgA3mK2Ck2k,2261
-holado_report/report/builders/short_scenario_failed_report_builder.py,sha256=9athhQPoVioz-NTc1BoD0kbCqKzW3ARkQy77ODPuGkM,4011
+holado_report/report/builders/short_scenario_failed_report_builder.py,sha256=50pXhWX8xwIDZWSFaBejzMUlS9a0GRXqA82d84V3udk,4012
 holado_report/report/builders/summary_report_builder.py,sha256=v4LG3W5x_y4FH0kh_5MRaG8pyPOV2GfhlBImsW4BJrs,3954
-holado_report/report/builders/summary_scenario_failed_report_builder.py,sha256=NGJiUTGpEWBcC9Chj6oY34fnQ_SUBoLWKEkBhlwKy9o,3062
-holado_report/report/builders/summary_scenario_report_builder.py,sha256=OaHfZitXFoX0lrGXzRX6zeXGiUFiYh44fNdxxKDRCGQ,3864
+holado_report/report/builders/summary_scenario_failed_report_builder.py,sha256=uqf86SUAiIQLRQOV0A434oR8Bj4e_DtxqRsy-pe84p4,3063
+holado_report/report/builders/summary_scenario_report_builder.py,sha256=ZtOg5SWgFUsOJyG-KLybT-8twTX3CwmuFTVIaWJXXZ8,3865
 holado_report/report/reports/base_report.py,sha256=NGnWe66uyvT4bCjhd3upwVpc6yQ2gyVNFhcy-3LeQsE,6850
 holado_report/report/reports/feature_report.py,sha256=i0wpk3LQLArVjWDsP9UcNSJzAUWwLhe73HNyfye2gYQ,4810
 holado_report/report/reports/scenario_report.py,sha256=eMyqw9EzaKMmX3pGFJN1rqAOQ5eqO2ISZdxAfK3XQR4,2945
@@ -428,11 +428,11 @@ holado_s3/tools/s3/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 holado_s3/tools/s3/boto3_s3_client.py,sha256=NaYTvyxqiUZ5UshpLONSLLDEBHQU_etDlXDOqGNxR-w,2360
 holado_s3/tools/s3/minio_client.py,sha256=B_Ie2fNIqyJE5vXO4iQw3Tg5yk8k-yGBuJtaf4aDQyU,3193
 holado_s3/tools/s3/moto_server.py,sha256=zft4KgYIFbJot0JyQJCAwEcbGDJIKinqOUIKRuSrSHE,2493
-holado_scripting/__init__.py,sha256=wsTcscy-q0EoQq2Hmf1KbEejIez2UUfLp3TdQHMVWlc,3744
+holado_scripting/__init__.py,sha256=1VICcEckplGOYwcPJ6U0TbghWigTOEtcWuYL6z_U14Y,3908
 holado_scripting/common/tools/dynamic_text_manager.py,sha256=dR9DGVj4nb_icFlnLB3jRQu8DDwTuC3tX46BDyi9xec,3332
 holado_scripting/common/tools/evaluate_parameters.py,sha256=zru4_vwqIx_KxWVG_luOcmr-0ywjmY7aaEN4TCvCjb4,10405
 holado_scripting/common/tools/expression_evaluator.py,sha256=pig2dNisHTuRnLh7vR6ciwn0o8rnDvVOQKT44iF0QB4,24309
-holado_scripting/common/tools/variable_manager.py,sha256=VGJH_OYPduTCSA_CLMpZUiC_nqAJJtGWZ2mwPEGzpW8,15672
+holado_scripting/common/tools/variable_manager.py,sha256=oFJ8vNMdqA2NO_vAOpUNWetE1i3_2-_jynNJC7Dw_Q0,17611
 holado_scripting/tests/behave/steps/__init__.py,sha256=GSug7OdldGvwbSuJOuLQVIZ8qU4bsfdvTY6VzSnMbTE,1544
 holado_scripting/tests/behave/steps/common/tools/variable_convert_steps.py,sha256=sPxZ1U1Wm9LBUjwEKvxE2nfz6cRatlXUZCGIK-QPpi0,7902
 holado_scripting/tests/behave/steps/common/tools/variable_new_steps.py,sha256=0VqwuzKdD_ZiUxzqF5vPoTbrTIhiPOpWEXK8qljqmQA,6153
@@ -496,8 +496,8 @@ holado_test/behave/behave_manager.py,sha256=TEAfPgBQQONFn_l0s7gm7gDgWU0EejvuaPuF
 holado_test/behave/independant_runner.py,sha256=QR_IS-qkK_x2FTryb2gRQrqyBU3YUgKqsaIL2xwXPNQ,3189
 holado_test/behave/scenario/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 holado_test/behave/scenario/behave_step_tools.py,sha256=apMS8nvdY-vbXsUIw1mVR4wOy2xWHMOCPJ1QiYNU-hI,6612
-holado_test/common/context/feature_context.py,sha256=9U5n-i7xdcSQlCeMM0savlek8doS5fGqkI3sFIiCGTY,3375
-holado_test/common/context/scenario_context.py,sha256=pkv5uC-GGQeGyu2MB6m58eWv6TPuQLTV0NM_aGMB7c8,7129
+holado_test/common/context/feature_context.py,sha256=XD5t2O6IDdhh6n4K1n7u5MPm-zI3k38mun_pj8lKQGE,3575
+holado_test/common/context/scenario_context.py,sha256=lj332-EsRazz91Twl64iTcrNiyqOBYCk9kD4ADl73gA,7330
 holado_test/common/context/step_context.py,sha256=jknJVU0OrzRaqlTJyhwBFjr9uKPe1dgjao32F4RGE8g,2410
 holado_test/common/exceptions/undefined_step_exception.py,sha256=SHHX22iz4Ip-V4Y3aM2EJFDt30CCS5EaauN6KB-JORo,1461
 holado_test/scenario/step_tools.py,sha256=iNay6tQPUi4sG-a8PY5LbbLpX0PRakkOj3ls98aEbHM,26375
@@ -671,7 +671,7 @@ test_holado/tools/django/api_rest/api_rest/api1/serializers.py,sha256=o_YxFr-tgC
 test_holado/tools/django/api_rest/api_rest/api1/tests.py,sha256=mrbGGRNg5jwbTJtWWa7zSKdDyeB4vmgZCRc2nk6VY-g,60
 test_holado/tools/django/api_rest/api_rest/api1/views.py,sha256=kOt2xT6bxO47_z__5yYR9kcYIWWv4qYzpX0K8Tqonik,758
 test_holado/tools/django/api_rest/api_rest/api1/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-holado-0.10.0.dist-info/METADATA,sha256=oEi5XHFtWVdRSs9H_2nAI3A3dzSXFYiZosDZqVyflK4,7672
-holado-0.10.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-holado-0.10.0.dist-info/licenses/LICENSE,sha256=IgGmNlcFHnbp7UWrLJqAFvs_HIgjJDTmjCNRircJLsk,1070
-holado-0.10.0.dist-info/RECORD,,
+holado-0.10.2.dist-info/METADATA,sha256=4_dqAlxXKA4_NttBQYpoNN-cSwaxpJurg1cwUVc4UIY,7672
+holado-0.10.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+holado-0.10.2.dist-info/licenses/LICENSE,sha256=IgGmNlcFHnbp7UWrLJqAFvs_HIgjJDTmjCNRircJLsk,1070
+holado-0.10.2.dist-info/RECORD,,

holado_ais/ais/ais_messages.py

@@ -94,13 +94,14 @@ class AISMessages(object):
             
             # Extract tagblock of first sentence if present, and add tagblock information in result
             tag_block_str, _ = self.split_sentence_to_tab_block_and_message(sentences[0])
-            if not isinstance(tag_block_str, bytes):
-                tag_block_str = tag_block_str.encode('utf8')
-            logger.print(f"++++++++++++ {tag_block_str=}")
-            tag_block = TagBlock(tag_block_str)
-            tag_block.init()
-            tag_block_dict = tag_block.asdict() if tag_block is not None else None
-            if tag_block_dict is not None:
+            if tag_block_str is None:
+                tag_block_dict = None
+            else:
+                if not isinstance(tag_block_str, bytes):
+                    tag_block_str = tag_block_str.encode('utf8')
+                tag_block = TagBlock(tag_block_str)
+                tag_block.init()
+                tag_block_dict = tag_block.asdict()
                 tag_block_dict = {k:v for k,v in tag_block_dict.items() if k != 'raw' and v is not None}
             
             # Build result
@@ -175,7 +176,6 @@ class AISMessages(object):
             seq_id = kwargs.pop('seq_id') if 'seq_id' in kwargs else self.__tag_block_group_id % 10
             group_id = kwargs.pop('group_id') if 'group_id' in kwargs else None
             
-            logger.print(f"+++++++ encode_msg: {msg=} ; {talker_id=} ; {kwargs=}")
             sentences = pyais.encode_msg(msg, seq_id=seq_id, talker_id=talker_id, **kwargs)
             return self.__encode_add_tag_block(sentences, tag_block, with_tag_block=with_tag_block, group_id=group_id)
         

holado_core/common/tools/path_manager.py

@@ -158,13 +158,13 @@ class PathManager(object):
         else:
             return base_path
     
-    def get_reports_path(self, name=None):
+    def get_reports_path(self, name=None, with_application_group=True):
         base_path = os.getenv('HOLADO_OUTPUT_BASEDIR')
         if base_path is None:
             base_path = os.path.join(self.get_user_home_path(), '.holado', 'output')
         
         res = os.path.join(base_path, "reports")
-        if Config.application_group is not None:
+        if with_application_group and Config.application_group is not None:
             res = os.path.join(res, Config.application_group)
         if name is not None:
             res = os.path.join(res, name)

holado_logging/common/logging/log_manager.py

@@ -39,6 +39,7 @@ class LogManager(object):
         self.on_console = False
         self.__console_handler = None
         
+        # Manage file handlers
         self.in_file = True
         self.__files_lock = threading.Lock()
         self.__file_names = []
@@ -47,20 +48,26 @@ class LogManager(object):
         self.__root_file_handler = None
         self.__root_file_handler_active = False
         
+        # Manage file paths LIFO by loggers
+        self.__files_by_logger = {}
+        
         # Initialize format according python version
         from holado_multitask.multitasking.multitask_manager import MultitaskManager
         if MultitaskManager.has_thread_native_id():
             # Exists since python 3.8
             # self.format = '{asctime:s} | {thread_native_id:-5d} | {levelname:5s} | {name:50s} | {message:s}'
             self.format = '{asctime:s} | {process:-5d}-{thread_native_id:-5d} | {levelname:5s} | {name:50s} | {message:s}'
+            self.format_short = '{asctime:s} | {message:s}'
             self.style = '{'
         else:
             if sys.version_info > (3, 2):
                 # self.format = '{asctime:s} | {thread:-5d} | {levelname:5s} | {module:35s} | {message:s}'
                 self.format = '{asctime:s} | {process:-5d}-{thread:-5d} | {levelname:5s} | {name:50s} | {message:s}'
+                self.format_short = '{asctime:s} | {message:s}'
                 self.style = '{'
             else: 
                 self.format = '%(asctime)s | %(process)-5d-%(thread)-5d | %(levelname)5s | %(module)35s | %(message)s'
+                self.format_short = '%(asctime)s | %(message)s'
                 self.style = '%'
         
     def configure(self):
@@ -193,7 +200,6 @@ class LogManager(object):
         
     def add_root_file_handler(self):
         from holado_core.common.exceptions.technical_exception import TechnicalException
-        from holado_multitask.multitasking.multitask_manager import MultitaskManager
         
         logger_ = logging.getLogger()
             
@@ -201,13 +207,8 @@ class LogManager(object):
             raise TechnicalException("Root log file is not defined")
             
         if self.__root_file_handler is None:
-            logger_.info("Creating file handler to root file '{}'.".format(self.__root_file_name))
-            Path(os.path.dirname(self.__root_file_name)).mkdir(parents=True, exist_ok=True)
-            
-            self.__root_file_handler = logging.FileHandler(self.__root_file_name, mode='w', encoding='utf8')
-            self.__root_file_handler.setFormatter(logging.Formatter(fmt=self.format, style=self.style))
-            if MultitaskManager.has_thread_native_id():
-                self.__root_file_handler.addFilter(filter_thread_native_id)
+            logger.info("Creating file handler to root file '{}'.".format(self.__root_file_name))
+            self.__root_file_handler = self.__new_file_handler(self.__root_file_name)
             
         logger_.addHandler(self.__root_file_handler)
         self.__root_file_handler_active = True
@@ -215,15 +216,13 @@ class LogManager(object):
     def remove_root_file_handler(self, do_reset=False):
         logger_ = logging.getLogger()
         if self.__root_file_handler:
-            logger_.info(f"Removing log destination to root file '{self.__root_file_name}'.")
+            logger.info(f"Removing log destination to root file '{self.__root_file_name}'.")
             logger_.removeHandler(self.__root_file_handler)
             self.__root_file_handler_active = False
             if do_reset:
                 self.__root_file_handler = None
         
     def add_file_handler(self, file_name, logger_=None):
-        from holado_multitask.multitasking.multitask_manager import MultitaskManager
-        
         if logger_ is None:
             logger_ = logging.getLogger()
             
@@ -232,35 +231,59 @@ class LogManager(object):
             self.add_log_file(file_name)
             
         if file_name in self.__file_handlers:
-            logger_.debug("Log destination already set to file '{}'.".format(file_name))
+            logger.debug("Log destination already set to file '{}'.".format(file_name))
         else:
-            logger_.info("Adding log destination to file '{}'.".format(file_name))
-            Path(os.path.dirname(file_name)).mkdir(parents=True, exist_ok=True)
-            
-            file_handler = logging.FileHandler(file_name, mode='w', encoding='utf8')
-            file_handler.setFormatter(logging.Formatter(fmt=self.format, style=self.style))
-            if MultitaskManager.has_thread_native_id():
-                file_handler.addFilter(filter_thread_native_id)
-            
+            logger.info("Adding log destination to file '{}'.".format(file_name))
+            file_handler = self.__new_file_handler(file_name)
             self.__file_handlers[file_name] = file_handler
-            logger_.addHandler(file_handler)
-                
-    def remove_file_handler(self, file_name, logger_=None, do_remove_log_file=True):
-        from holado_core.common.exceptions.technical_exception import TechnicalException
+            self.add_existing_file_handler_to_logger(file_name, logger_)
+    
+    def __new_file_handler(self, file_path, use_format_short=False):
+        from holado_multitask.multitasking.multitask_manager import MultitaskManager
+        
+        Path(os.path.dirname(file_path)).mkdir(parents=True, exist_ok=True)
+        
+        res = logging.FileHandler(file_path, mode='w', encoding='utf8')
+        fmt = self.format_short if use_format_short else self.format
+        res.setFormatter(logging.Formatter(fmt=fmt, style=self.style))
+        if MultitaskManager.has_thread_native_id():
+            res.addFilter(filter_thread_native_id)
         
+        return res
+    
+    def remove_file_handler(self, file_name, logger_=None, do_remove_log_file=True):
         if logger_ is None:
             logger_ = logging.getLogger()
             
-        if file_name not in self.__file_handlers:
-            raise TechnicalException(f"Not set log destination to file '{file_name}'")
-        
-        logger_.info("Removing log destination to file '{}'.".format(file_name))
-        logger_.removeHandler(self.__file_handlers[file_name])
+        logger.info("Removing log destination to file '{}'.".format(file_name))
+        self.remove_existing_file_handler_from_logger(file_name, logger_)
         del self.__file_handlers[file_name]
         
         if do_remove_log_file:
             self.remove_log_file(file_name)
     
+    def add_existing_file_handler_to_logger(self, file_name, logger_):
+        from holado_core.common.exceptions.technical_exception import TechnicalException
+        
+        if self.__root_file_name == file_name:
+            file_handler = self.__root_file_handler
+        else:
+            if file_name not in self.__file_handlers:
+                raise TechnicalException(f"Not set log destination to file '{file_name}'")
+            file_handler = self.__file_handlers[file_name]
+        logger_.addHandler(file_handler)
+    
+    def remove_existing_file_handler_from_logger(self, file_name, logger_):
+        from holado_core.common.exceptions.technical_exception import TechnicalException
+        
+        if self.__root_file_name == file_name:
+            file_handler = self.__root_file_handler
+        else:
+            if file_name not in self.__file_handlers:
+                raise TechnicalException(f"Not set log destination to file '{file_name}'")
+            file_handler = self.__file_handlers[file_name]
+        logger_.removeHandler(file_handler)
+    
     def __remove_existing_file_handlers(self, log_level_if_exists=None):
         with self.__files_lock:
             if len(self.__file_names) > 0:
@@ -289,5 +312,24 @@ class LogManager(object):
             self.add_root_file_handler()
         self.remove_file_handler(file_name, do_remove_log_file=do_remove_log_file)
     
+    def enter_log_file_for_logger(self, logger_, file_path, use_format_short=False, switch_in=True):
+        logger_name = logger_.name
+        if logger_name not in self.__files_by_logger:
+            self.__files_by_logger[logger_name] = []
+        
+        if switch_in and len(self.__files_by_logger[logger_name]) > 0:
+            logger_.removeHandler(self.__files_by_logger[logger_name][-1][1])
+        
+        file_handler = self.__new_file_handler(file_path, use_format_short=use_format_short)
+        logger_.addHandler(file_handler)
+        self.__files_by_logger[logger_name].append( (file_path, file_handler) )
+        
+    def leave_log_file_for_logger(self, logger_, switch_out=True):
+        logger_name = logger_.name
+        _, file_handler = self.__files_by_logger[logger_name].pop()
+        logger_.removeHandler(file_handler)
+        
+        if switch_out and len(self.__files_by_logger[logger_name]) > 0:
+            logger_.addHandler(self.__files_by_logger[logger_name][-1][1])
     
     

holado_multitask/multithreading/context/thread_context.py

@@ -61,7 +61,9 @@ class ThreadContext(Context):
                 
             manager = VariableManager(var_man)
             self.set_object("variable_manager", manager)
-            manager.initialize(SessionContext.instance().dynamic_text_manager, SessionContext.instance().unique_value_manager)
+            file_path = SessionContext.instance().report_manager.get_path("logs", f"variable_update-thread_{self.thread_uid}.log")
+            manager.initialize(SessionContext.instance().dynamic_text_manager, SessionContext.instance().unique_value_manager,
+                               variable_update_log_file_path=file_path)
         return self.get_object("variable_manager")
     
     

holado_python/standard_library/queue.py

@@ -61,7 +61,7 @@ class IterableQueue(queue.Queue, typing.Iterable):
     
 
 class IterableLifoQueue(IterableQueue):
-    '''Copyt of implementation of queue.LifoQueue but inheriting of IterableQueue.'''
+    '''Copy of implementation of queue.LifoQueue but inheriting of IterableQueue.'''
 
     def _init(self, maxsize):
         self.queue = []

holado_python/standard_library/ssl/resources/certificates/tcpbin.crt

@@ -2,20 +2,20 @@
 MIIDZTCCAk2gAwIBAgIBKjANBgkqhkiG9w0BAQsFADCBizELMAkGA1UEBhMCVVMx
 CzAJBgNVBAgMAkNBMRYwFAYDVQQHDA1TYW4gRnJhbmNpc2NvMQ8wDQYDVQQKDAZ0
 Y3BiaW4xDDAKBgNVBAsMA29wczETMBEGA1UEAwwKdGNwYmluLmNvbTEjMCEGCSqG
-SIb3DQEJARYUaGFycnliYWdkaUBnbWFpbC5jb20wHhcNMjUxMDAyMTMzNjQ1WhcN
-MjUxMDAzMTMzNjQ1WjAcMRowGAYDVQQDDBF0Y3BiaW4uY29tLWNsaWVudDCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK2xah/MsJKGnIpj84nYfBRCeAh8
-MmN5dZwUCteehkX+wFhioEx1loAIqcqs6MPe7qQdeROuOZlGeiDR/6X0mnDsgyR4
-qUnrIaRHS3EFWGtGp0WRLsQhKNvtxAHL7dErz7BoxTO5gV/w6dcT3uPORfZxkZdm
-6t01t7DwPFktopQju9E8eeMBKVKaO1RrclZKkWEyfuHP3wNpIE6GwsH8jCn4I+r/
-Y8Pgd+k4EyCaH+ngtFbS0lEhxxuqTpPRYyQrlEDMa1i/nETuMiL2WFkjEO2gEX/p
-w05GlO3YUTDpaXWUWZf+Ck7MYevrFDC57oSZvMwTn5pJrQztvNJjFc+YF6kCAwEA
-AaNCMEAwHQYDVR0OBBYEFLuHuKWOQ/U1+OpiGgffNV1faI9qMB8GA1UdIwQYMBaA
-FOLuMowBSAZfV5v82LmlaIIOvU/DMA0GCSqGSIb3DQEBCwUAA4IBAQBYIRlg6Paz
-ALTKoBm8nRB19n4d7Ay+U1bUBCP2U5vZkUTSu05ttQXT72TaFIaT04pFs9uIHGFZ
-9yhP2DgbuCaexQrvf9yf6nnoCqLjlhJ8Y0NmscK14Hp9GgVSnkXeweL82gFsXB45
-FaqqyDn20QiH14nwU2H7g8y/Ys0PIemhjG8UT7OjSLyhkaCkxwYy88N/2YjX3hGH
-9eTHvfMZ+9E7Urh3DevivhfPQnX/6lUAOK7Sr+WTIEjpZ89Lz/rLltRCXoXv75C4
-PdRoxB2/lo+3+X1i4B7ujaduZDLaMyPcckbpuTYxjPZtoxhLyYkKgzQTUMwYsVrW
-DoI6HuqlfzoH
+SIb3DQEJARYUaGFycnliYWdkaUBnbWFpbC5jb20wHhcNMjUxMDE2MjIzNTE5WhcN
+MjUxMDE3MjIzNTE5WjAcMRowGAYDVQQDDBF0Y3BiaW4uY29tLWNsaWVudDCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMxmg8CRudZQj9pgRnvPQrWyqn1A
+55RlXoax8OMEeEQHhreCOj69WV6K9OvHebbAtMNCEyXFwNUNX1XjlhhLcqhY5yLR
+5k9vgOoq2ribBwdMRnYyIajWp7y53L/J35Qf2FWNeS+3AXv/mWiYnGpTJZHXCMyo
+wOgDqeqz5wzl8ncvj5HWBkZm/mPDwK6fR/4SXMv+NIBooUKGZTST/1Q75/tvPhwf
+dpGWTUd1xKw3TKz63B+jAATdPbIxTnSxJY1uLdBZ1hUguGxrC+nvqgY0283lVz3n
+Jz7P2BCwmwmgRwBLIUw1381QuFJjGlKSglw/HraIfVyJASQqEk2gVil5Gr8CAwEA
+AaNCMEAwHQYDVR0OBBYEFMQRuiY7hUUnl5wxL6R6gnlhyXaiMB8GA1UdIwQYMBaA
+FOLuMowBSAZfV5v82LmlaIIOvU/DMA0GCSqGSIb3DQEBCwUAA4IBAQBAX/CniZsN
+9YWuDt7CS+YBpLRe46ryZXzmACpmz4uDzRs+3MRnCtOz1121dW0+zuPMdopxwjG2
+GyPirI1mDasoJDn5jRWP1NBvuFN7fcAVsMDi3vBMfzd+oV4Pcgi7uydcd0zX+onp
+1QIyNwAulQB03gfe6IcPAUwyTOtJoc7yo1W6eH/W+RGmj5BaUP+5SB3EHjqih6ds
+xPc4yJ43N1gYsXRZDoYuqmy+/h0JQmFupPJRAbOFbh3IsunbLXvsKXzlrgKlhsCg
+H0Kc97t7ZQNCzgymNnxsbepNddWwGF8hAj4FruFYtO9rt00aT2bqb9Yw4pRJ+fM8
+nDVx1r7BCieF
 -----END CERTIFICATE-----

holado_python/standard_library/ssl/resources/certificates/tcpbin.key

@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCtsWofzLCShpyK
-Y/OJ2HwUQngIfDJjeXWcFArXnoZF/sBYYqBMdZaACKnKrOjD3u6kHXkTrjmZRnog
-0f+l9Jpw7IMkeKlJ6yGkR0txBVhrRqdFkS7EISjb7cQBy+3RK8+waMUzuYFf8OnX
-E97jzkX2cZGXZurdNbew8DxZLaKUI7vRPHnjASlSmjtUa3JWSpFhMn7hz98DaSBO
-hsLB/Iwp+CPq/2PD4HfpOBMgmh/p4LRW0tJRIccbqk6T0WMkK5RAzGtYv5xE7jIi
-9lhZIxDtoBF/6cNORpTt2FEw6Wl1lFmX/gpOzGHr6xQwue6EmbzME5+aSa0M7bzS
-YxXPmBepAgMBAAECggEBAIqgeMTch2jKyxGg6HTyNUWuL0MGbOj7vaROUsD4os4m
-nrlsLegYSX/yaiF6k2QQ/4I4i7Prb8kneL3NHS8E5GaQPbLUIrj+UyFcTZfs3j7w
-avyY/SxIEuZFBBUy/6HcR6zSUeIQgnNiQiAImfJTZX9l8P9Xgsf+4Zb0hhXe2E1G
-TqLAYWnLoxD9us0rryQb37mRIREKcTO3qza+FXk32bWe83f1Dy46JJIChIoQg/QB
-hwzSL51ld22fy7p+bsqeI3HUDWHplq4T0lws0SGUd4IvntF9rNGYHAI+aUKwiUBC
-g/0se9+GBKeMSjhS11F9/Clg4i0E/tN/poOytA83aAECgYEA3+E0bhbaFAvzzevv
-tAWSXkwHSFZ745KsJSJ8OOVkd+ATleyGl3AoRTrDxNqY+R/TvBFaTyiY+zqGV6tj
-NI8SaSXuhRzbA9zDL2rSH7GIOeqzUs8PSUMk6JnmfCKk+aTBOoi8ULolHE4N6B45
-te3GVgy/luJK22pPLCMsmL+D0ykCgYEAxpzr8T2CPVtl33W+loGbvrqZ1xXgq/7n
-IsjHZdVdFsIIxFhtE2A2iO/7vMsLmwkZ7LgbtHcfEPOxjx5VzVt89l1I2lnP0jW+
-pjKrN/eyXcHnWLLPCEtXA06oIvyem/VMSGXumu7EcOJZjnG3/PmqCWCjc2UUo2lJ
-F2rQdC9bMIECgYEAl3nSdaI0j1e+79bw6kbSz8Z1LvaFAGce3klE72IV5h3QYqIU
-NqaGOMEX8DtPQU/NfPPovKJlT6Y7e1nU15zuAgLOLXZmoWhfD9ggr5z45Obtydub
-JiCt+ksW7WqrYNWef7JAaAZqUYpmUmUQ+w0UIuihQL9/kpGNW/m4lOkPknECgYAI
-gbodWAwXAq4nVwy1t5FrJuTl8HryAvX1aHIZ63yUN/VWK49ocAuF6/l1SaESn94r
-ZGtTXHLJMBbf0WXNaOi+SJqRN52OHF0xEySAPiy2lVKKWwZBDbEJZDoRXY6RkX0V
-8L+6hRWG3DsHvdkqjar5wdjeXWr34M+PoDSTdV/LgQKBgFAqJc4I91AK8Ah9Ba8k
-LqYtRFGFJ2J+p8QqcibfT6d6tZqWffxiXbQ5bS52/fmM3BdxEHjtzLdA7cOqCh6g
-79kxRb3B5jjq5JvGtLy89VphZ08W9dhzgL/l3KGtgMobfTYUEDaNk33oExhItQnx
-F97ecAMIx20oqFFOg6N0unwW
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDMZoPAkbnWUI/a
+YEZ7z0K1sqp9QOeUZV6GsfDjBHhEB4a3gjo+vVleivTrx3m2wLTDQhMlxcDVDV9V
+45YYS3KoWOci0eZPb4DqKtq4mwcHTEZ2MiGo1qe8udy/yd+UH9hVjXkvtwF7/5lo
+mJxqUyWR1wjMqMDoA6nqs+cM5fJ3L4+R1gZGZv5jw8Cun0f+ElzL/jSAaKFChmU0
+k/9UO+f7bz4cH3aRlk1HdcSsN0ys+twfowAE3T2yMU50sSWNbi3QWdYVILhsawvp
+76oGNNvN5Vc95yc+z9gQsJsJoEcASyFMNd/NULhSYxpSkoJcPx62iH1ciQEkKhJN
+oFYpeRq/AgMBAAECggEAUKjruSRIl6A3BFAVwGnrw1P8H21rdY4DHVg+3Pc4lm/5
+45TKc1O5XqurNxgCmfG144/BiphdHjYmtvgWlQPA/VoH7B+0qQgxcTb0FQFoZqLc
+82uZCM2cZ8dYq354cjWW4zvu5LttJIea/EGtB/BD1SdsW4cEiQpZFTtlJBvh8NHo
+7+o0mPwwBrXmadsLlxDmhQ0Wsw4ltaK7eMBJlLalg9f/3uW4ArW0OXVK1ycszNXM
+2pfrp9zKYcPzWEP+wrC/6f+AXFDacUIzwxsfNtlI7O57t8pQXf5pkyeBHHlxCvN/
+XYx+UBWip6tRnlZRqNvl/8NC0JpX9P8xaeNp21haAQKBgQD1rlkZ9umlmC9PB5oc
+Tp00KC5KQmgfqRfEBEVzmm4yGHK0OMx0pCnP/ZONZaE4QX4TmeLCnUxgYCdxl6ep
+406g0i2ig7M+RZ18skh4ubpoiQlLIoNW2mOpV/Hzt53st0HAYogPubrVZAnn/KwA
+zehlj0w1yljBXDsK9c6deCdIgQKBgQDU/E12s8aCC0ngOSZqe0lkDWU/yQfX8BnJ
+cSA3dU1mwGzP+02N5AXZuxwUql1rjE45ERPISQ2+eHtUk3n7QH0+7KNRmj7Jk9xC
+QIN5lExdO3tAXo/muH6PCkyeNrkRSdfNgssYMVJZqbD8O5IM6v6yEbQHOxuskvvu
+uWRxQZTDPwKBgEfqcUqYbGx8z9xibUo7+Oh7mpFCPxiFdt96IJpmajtfzLPUrIS4
+SUUJBVgul7LP+Qfj0+0D/od3nhQyQHIKh8mrvJAF3UItPpxx06UDOP3An2fPAoM6
+ClJX3AtrhF72hdi6/vkbdQVh80RlQjQ6Ef0opTZZtQFk7iOXMJQHx/gBAoGAahxl
+T41Tifirzq1KaWSQ9OsDlZrHcJrrjgPxZA/qBxY5YAk440dGbuqcm+Mg9fMKCb5r
+V66lzU5jS4jKDhZcD9x/pakuPOmQo+VWW106Cn0W88Po967VRth/wZdL7sQWYwoV
+uzDfcVJsnc3j/tGZIQhW4/9b00fLgm0VEKP2xKsCgYEAkylyhMcTA9nuiBGecBFW
+fRbuL6tWcnj3b8lnNOoBFTp6uVSi7VTYcZttGP7zLa9v/LRegawpf1meOarn80Wo
+pz1Ot3ZEgx6iArdgdejSHbps58dTpoXp6YBlZR08G5tw2aHfppJYq2Vz3RLrv5Kf
+k6MQ4yJFgkb+8+cpvp3NxgA=
 -----END PRIVATE KEY-----

holado_report/campaign/campaign_manager.py

@@ -82,7 +82,7 @@ class CampaignManager(object):
             self.import_campaign_reports(report_path)
     
     def __get_campaigns_report_paths(self, since_datetime):
-        reports_path = SessionContext.instance().path_manager.get_reports_path()
+        reports_path = SessionContext.instance().path_manager.get_reports_path(name="test_runner", with_application_group=False)
         file_paths = SessionContext.instance().path_manager.find_files(reports_path, subdir_relative_path='report_summary_scenario_all.txt', since_datetime=since_datetime)
         return [os.path.dirname(p) for p in file_paths]
     
@@ -185,7 +185,7 @@ class CampaignManager(object):
             scenario_name = parts[1]
             status_info = parts[-1]
             
-            m = re.match(r"^(.*?)(?: \(.*\))?$", status_info)
+            m = re.match(r"^(.*?)(?: \(.*\)| => .*)?$", status_info)
             status = m.group(1)
             
             self.update_or_add_campaign_scenario(camp_id, scenario_name, status=status, status_at_str=status_dt_str)

holado_report/report/builders/failure_report_builder.py

@@ -48,7 +48,7 @@ class FailureReportBuilder(ReportBuilder):
             if step_error_message not in self.__failures:
                 self.__failures[step_error_message] = []
             
-            category_str = f" ({category_validation})" if category_validation else ""
+            category_str = f" => {category_validation}" if category_validation else ""
             if self.__file_format == 'txt':
                 msg_list = []
                 msg_list.append(f"scenario in {scenario.filename} at l.{scenario.line} - step {step_number} (l.{step_failed.line}) - {status_validation}{category_str}")

holado_report/report/builders/short_scenario_failed_report_builder.py

@@ -49,7 +49,7 @@ class ShortScenarioFailedReportBuilder(ReportBuilder):
         self.__open_file_if_needed()
         
         msg_list = []
-        category_str = f" ({category_validation})" if category_validation else ""
+        category_str = f" => {category_validation}" if category_validation else ""
         if step_failed is not None:
             msg_list.append(f"scenario in {scenario.filename} at l.{scenario.line} - step {step_number} (l.{step_failed.line}) - {status_validation}{category_str}")
         else:

holado_report/report/builders/summary_scenario_failed_report_builder.py

@@ -44,7 +44,7 @@ class SummaryScenarioFailedReportBuilder(ReportBuilder):
         
     def __file_fail_add_scenario(self, scenario, category_validation, status_validation, step_failed, step_number):
         self.__open_file_if_needed()
-        category_str = f" ({category_validation})" if category_validation else ""
+        category_str = f" => {category_validation}" if category_validation else ""
         if step_failed is not None:
             self.__file_fail.write(f"scenario in {scenario.filename} at l.{scenario.line} - step {step_number} (l.{step_failed.line}) - {status_validation}{category_str}\n")
         else:

holado_report/report/builders/summary_scenario_report_builder.py

@@ -63,7 +63,7 @@ class SummaryScenarioReportBuilder(ReportBuilder):
         dt = DateTime.now()
         dt_str = DateTime.datetime_2_str(dt, FORMAT_DATETIME_HUMAN_SECOND)
         
-        category_str = f" ({category_validation})" if category_validation else ""
+        category_str = f" => {category_validation}" if category_validation else ""
         if text:
             self.__file.write(f"{dt_str} - {scenario.filename} at l.{scenario.line} - {text} - {status_validation}{category_str}\n")
         else:

holado_report/report/report_manager.py

@@ -232,33 +232,59 @@ class ReportManager(BaseReport):
             if cls._get_test_server_client().is_available:
                 # Get scenario execution statuses
                 scenario_name = f"{scenario.filename} at l.{scenario.line}"
-                sce_hist = cls._get_test_server_client().get_scenario_history(scenario_name=scenario_name, size=10)
-                statuses = [s['status'] for s in sce_hist[0]['statuses']] if sce_hist else []
+                sce_hist = cls._get_test_server_client().get_scenario_history(scenario_name=scenario_name, size=29)
+                statuses = [s['status'] for s in reversed(sce_hist[0]['statuses'])] if sce_hist else []
                 statuses.append(status)
                 
                 # Get scenario status sequences
                 passed_sequences = []
+                is_failed_relevant = None
                 for status in statuses:
                     if status == 'Passed':
                         passed = True
                     elif status.startswith("Failed"):
                         passed = False
+                        if status == "Failed":
+                            is_failed_relevant = True
+                        elif is_failed_relevant is None:
+                            is_failed_relevant = False
                     else:
                         continue
-                    if len(passed_sequences) == 0 or passed != passed_sequences[-1]:
-                        passed_sequences.append(passed)
+                    
+                    if len(passed_sequences) == 0 or passed != passed_sequences[-1][0]:
+                        passed_sequences.append([passed, 1])
+                    else:
+                        passed_sequences[-1][1] += 1
                 
                 # Compute category
                 if passed_sequences:
+                    nb_exec = sum([x[1] for x in passed_sequences])
+                    last_passed, last_nb_times = passed_sequences[-1]
                     if len(passed_sequences) == 1:
-                        category = 'Success' if passed_sequences[0] else 'Failed'
+                        if last_passed:
+                            category = f'Always Success ({last_nb_times})'
+                        elif is_failed_relevant:
+                            category = f'Always Failed ({last_nb_times})'
+                        else:
+                            category = f'Always Not Relevant ({last_nb_times})'
+                    elif last_passed and len(passed_sequences) in [2, 3]:
+                        category = f'Fixed ({last_nb_times} success / {nb_exec})'
                     elif len(passed_sequences) > 2:
-                        category = 'Randomly Failed'
-                    elif passed_sequences[-1]:
-                        category = 'Newly Success'
+                        nb_fail = sum([x[1] for x in passed_sequences if not x[0]])
+                        if is_failed_relevant:
+                            category = f'Random ({nb_fail} fails / {nb_exec})'
+                        else:
+                            category = f'Random but Not Relevant ({nb_fail} fails / {nb_exec})'
+                    elif not last_passed:
+                        if is_failed_relevant:
+                            category = f'Regression ({last_nb_times} fails / {nb_exec})'
+                        else:
+                            category = f'Regression but Not Relevant ({last_nb_times} fails / {nb_exec})'
                     else:
-                        category = 'Newly Failed'
-            
+                        category = f'Unknown (unmanaged sequence: {passed_sequences})'
+                
+                logger.print(f"++++++++++ {category} <= {statuses}")
+                
             cls._scenario_status_information_by_uid[scenario_uid] = [category, status, step_failed, step_nb]
         
         return cls._scenario_status_information_by_uid[scenario_uid]

holado_scripting/__init__.py

@@ -27,7 +27,8 @@ def register():
     from holado_scripting.common.tools.variable_manager import VariableManager
     SessionContext.instance().services.register_service_type("variable_manager", VariableManager,
                             lambda m: m.initialize(SessionContext.instance().dynamic_text_manager, 
-                                                   SessionContext.instance().unique_value_manager) )
+                                                   SessionContext.instance().unique_value_manager,
+                                                   variable_update_log_file_path=SessionContext.instance().report_manager.get_path("logs", "variable_update.log") ) )
     
     
     from holado_scripting.common.tools.expression_evaluator import ExpressionEvaluator

holado_scripting/common/tools/variable_manager.py

@@ -22,8 +22,10 @@ from typing import NamedTuple
 import threading
 from holado.common.tools.gc_manager import GcManager
 from holado_python.standard_library.typing import Typing
+from holado.common.context.session_context import SessionContext
 
 logger = logging.getLogger(__name__)
+# logger_update = logging.getLogger(__name__ + ".update")
 
 
 class VariableManager(DeleteableObject):
@@ -46,9 +48,22 @@ class VariableManager(DeleteableObject):
         self.__temporary_variables_lock = threading.Lock()
         self.__temporary_variables = {}
         
-    def initialize(self, dynamic_text_manager, unique_value_manager):
+        # Manage variable update log file
+        self.__variable_update_log_file_path = None
+        self.__is_entered_in_variable_update_log_file = False
+        self.__logger_update = logging.getLogger(__name__ + f".update.{id(self)}")
+    
+    def initialize(self, dynamic_text_manager, unique_value_manager, variable_update_log_file_path=None):
+        """ Initialize variable manager
+        @param dynamic_text_manager Dynamic text manager instance to use
+        @param unique_value_manager Unique value manager instance to use
+        @param variable_update_log_filename If defined, log all variable updates in given file in addition to normal logs
+        """
         self.__dynamic_text_manager = dynamic_text_manager
         self.__unique_value_manager = unique_value_manager
+        
+        # Manage variable update log file
+        self.__variable_update_log_file_path = variable_update_log_file_path
     
     @property
     def parent(self):
@@ -71,6 +86,19 @@ class VariableManager(DeleteableObject):
         # # Clear variables
         # self.__variables.clear()
         
+        # Leave variable update log file
+        self.__leave_variable_update_log_file()
+    
+    def __enter_variable_update_log_file(self):
+        if self.__variable_update_log_file_path is not None and not self.__is_entered_in_variable_update_log_file:
+            SessionContext.instance().log_manager.enter_log_file_for_logger(self.__logger_update, self.__variable_update_log_file_path, use_format_short=True)
+            self.__is_entered_in_variable_update_log_file = True
+    
+    def __leave_variable_update_log_file(self):
+        if self.__variable_update_log_file_path is not None and self.__is_entered_in_variable_update_log_file:
+            SessionContext.instance().log_manager.leave_log_file_for_logger(self.__logger_update)
+            self.__is_entered_in_variable_update_log_file = False
+    
     @contextmanager
     def temporary_variables(self):
         from holado_multitask.multitasking.multitask_manager import MultitaskManager
@@ -125,6 +153,7 @@ class VariableManager(DeleteableObject):
     def register_variable(self, variable_name, value, accept_expression=True, log_level=logging.INFO):
         from holado_multitask.multitasking.multitask_manager import MultitaskManager
         
+        self.__enter_variable_update_log_file()
         if Tools.do_log(logger, logging.TRACE):  # @UndefinedVariable
             logger.trace(f"Setting variable: {variable_name}=[{value}] (type: {Typing.get_object_class_fullname(value)})...")
         
@@ -134,13 +163,13 @@ class VariableManager(DeleteableObject):
                 self.register_variable(names[0], Object())
             var = self.get_value(names[0], through_patent=False)
             setattr(var, names[1], value)
-            if Tools.do_log(logger, log_level):
-                logger.log(log_level, f"Set variable expression: {variable_name}=[{value}] (type: {Typing.get_object_class_fullname(value)})")
+            if Tools.do_log(self.__logger_update, log_level):
+                self.__logger_update.log(log_level, f"Set variable expression: {variable_name}=[{value}] (type: {Typing.get_object_class_fullname(value)})")
         else:
             var_name = self.evaluate_variable_name(variable_name)
             self.__variables[var_name] = value
-            if Tools.do_log(logger, log_level):
-                logger.log(log_level, f"Set variable: {var_name}=[{value}] (type: {Typing.get_object_class_fullname(value)})")
+            if Tools.do_log(self.__logger_update, log_level):
+                self.__logger_update.log(log_level, f"Set variable: {var_name}=[{value}] (type: {Typing.get_object_class_fullname(value)})")
                 
             # Manage temporary variables
             uid = MultitaskManager.get_thread_uid()
@@ -149,6 +178,8 @@ class VariableManager(DeleteableObject):
                     self.__temporary_variables[uid].variable_names.add(var_name)
                 
     def unregister_variable(self, variable_name, through_parent=False, delete_value=False):
+        self.__enter_variable_update_log_file()
+        
         var_name = self.evaluate_variable_name(variable_name)
         if self.exists_variable(var_name, through_parent=False):
             value = self.__variables[var_name]
@@ -161,8 +192,8 @@ class VariableManager(DeleteableObject):
                 except Exception:
                     logger.exception(f"Catched exception while deleting object '{var_name}' (type: {Typing.get_object_class_fullname(value)})")
                 else:
-                    if Tools.do_log(logger, logging.DEBUG):
-                        logger.debug(f"Deleted variable '{var_name}' (type: {Typing.get_object_class_fullname(value)})")
+                    if Tools.do_log(self.__logger_update, logging.DEBUG):
+                        self.__logger_update.debug(f"Deleted variable '{var_name}' (type: {Typing.get_object_class_fullname(value)})")
             
             del self.__variables[var_name]
         elif through_parent and self.parent:
@@ -270,6 +301,8 @@ class VariableManager(DeleteableObject):
             Tools.raise_same_exception_type(exc, f"{exc}\nVariable '{var_name}': {var_repr}", add_from=True)
     
     def exec_set_variable_expression(self, expression, value, through_parent=True, log_level=logging.INFO):
+        self.__enter_variable_update_log_file()
+        
         var_name, expr_rest = self.__extract_expression_name(expression)
         var_value = self.get_variable_value(var_name, through_parent=through_parent)
         new_var_name = self.new_local_variable_name(sub_name=self.__regular_variable_name(var_name))
@@ -289,8 +322,8 @@ class VariableManager(DeleteableObject):
             # Tools.raise_same_exception_type(exc, f"{exc}\nVariable '{var_name}': {var_repr}", add_from=True)
             raise FunctionalException(f"Failed to set value in variable expression (by exec): {expression}=[{value}] (type: {Typing.get_object_class_fullname(value)})\nVariable '{var_name}': {var_repr}") from exc
         else:
-            if Tools.do_log(logger, log_level):
-                logger.log(log_level, f"Set value in variable expression (by exec): {expression}=[{value}] (type: {Typing.get_object_class_fullname(value)})")
+            if Tools.do_log(self.__logger_update, log_level):
+                self.__logger_update.log(log_level, f"Set value in variable expression (by exec): {expression}=[{value}] (type: {Typing.get_object_class_fullname(value)})")
     
     def __regular_variable_name(self, name):
         return "".join([c if re.match(r'\w', c) else '_' for c in name])

holado_test/common/context/feature_context.py

@@ -73,7 +73,9 @@ class FeatureContext(Context):
         if not self.has_variable_manager():
             manager = VariableManager(SessionContext.instance().multitask_manager.get_thread_context().get_variable_manager())
             self.set_object("variable_manager", manager)
-            manager.initialize(SessionContext.instance().dynamic_text_manager, SessionContext.instance().unique_value_manager)
+            file_path = SessionContext.instance().report_manager.current_feature_report.get_path("logs", "variable_update.log")
+            manager.initialize(SessionContext.instance().dynamic_text_manager, SessionContext.instance().unique_value_manager,
+                               variable_update_log_file_path=file_path)
         return self.get_object("variable_manager")
     
         

holado_test/common/context/scenario_context.py

@@ -135,7 +135,9 @@ class ScenarioContext(Context):
         if not self.has_variable_manager():
             manager = VariableManager(SessionContext.instance().get_feature_context().get_variable_manager())
             self.set_object("variable_manager", manager)
-            manager.initialize(self.get_dynamic_text_manager(), SessionContext.instance().unique_value_manager)
+            file_path = SessionContext.instance().report_manager.current_scenario_report.get_path("logs", "variable_update.log")
+            manager.initialize(self.get_dynamic_text_manager(), SessionContext.instance().unique_value_manager,
+                               variable_update_log_file_path=file_path)
         return self.get_object("variable_manager")
     
     def has_expression_evaluator(self):