PyPI - holado - Versions diffs - 0.11.3__py3-none-any.whl → 0.11.5__py3-none-any.whl - Mend

holado 0.11.3py3-none-any.whl → 0.11.5py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of holado might be problematic. Click here for more details.

Files changed (33) hide show

holado/common/context/session_context.py CHANGED Viewed

@@ -333,15 +333,19 @@ class SessionContext(Context):
         log_prefix = f"[After scenario '{scenario.name}'] "
         with self.__multitask_lock:
+            # End scenario
+            if not self.has_feature_context(is_reference=True):
+                raise TechnicalException(f"{log_prefix}No feature context is defined")
+            if not self.has_scenario_context(is_reference=True):
+                raise TechnicalException(f"{log_prefix}No scenario context is defined")
+            self.get_scenario_context().end()
             # Log error on failing scenario
-            category_validation, status_validation, step_failed, step_number = ReportManager.get_current_scenario_status_information(scenario)
+            category_validation, status_validation, step_failed, step_number, scenario_context, step_context = ReportManager.get_current_scenario_status_information(scenario)
             if status_validation != "Passed":
                 msg_list = []
                 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:
-                    msg_list.append(f"Scenario {status_validation}{category_str}:  [scenario in {scenario.filename} at l.{scenario.line} - step ? (missing step implementation ?)]")
+                msg_list.append(f"Scenario {status_validation}{category_str}: {ReportManager.format_context_period(scenario_context)} {ReportManager.format_scenario_short_description(scenario)} - {ReportManager.format_step_short_description(step_failed, step_number, step_context, dt_ref=scenario_context.start_datetime)}")
                 step_error_message = ReportManager.get_step_error_message(step_failed)
                 if step_error_message:
                     msg_list.append(step_error_message)
@@ -359,13 +363,6 @@ class SessionContext(Context):
                 # MemoryProfiler.log_tracker_diff(name="scenarios objects", prefix="[After scenario] ", level=logging.INFO, logger_=logger)  # @UndefinedVariable
             GlobalSystem.log_resource_usage(prefix=log_prefix, level=logging.INFO, logger_=logger)
-            if not self.has_feature_context(is_reference=True):
-                raise TechnicalException(f"{log_prefix}No feature context is defined")
-            if not self.has_scenario_context(is_reference=True):
-                raise TechnicalException(f"{log_prefix}No scenario context is defined")
-            self.get_scenario_context().end()
             # Post processes
             logger.info(f"{log_prefix}Post processing...")
             self.get_scenario_context().scope_manager.reset_scope_level()

{holado-0.11.3.dist-info → holado-0.11.5.dist-info}/METADATA RENAMED Viewed

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

{holado-0.11.3.dist-info → holado-0.11.5.dist-info}/RECORD RENAMED Viewed

@@ -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=IWxkeYnMSVImNyamTd3PXZSFIkXY96qFyAlC1y8s0J4,23475
+holado/common/context/session_context.py,sha256=PhdnA7mcNRW3N0CCOmnvHNc8eG9lSEqYRs9AwP0Fnlc,23414
 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,14 +14,14 @@ 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=J-GZJAY2RZpSS3OwzQJc6B_HsmdtRXLAcbfaP9APbUA,17414
+holado_ais/ais/ais_messages.py,sha256=0jrhIFH6htUZkUinqKcPuUp2JMtnp0qKwYFAmUk-6w0,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
 holado_ais/tests/behave/steps/__init__.py,sha256=cM4YsjHIq0Tb9mTTJjvDojzhLwov6mc2RyjZz8XLVA8,1321
 holado_ais/tests/behave/steps/ais/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 holado_ais/tests/behave/steps/ais/ais_manager_steps.py,sha256=nRtJUEyAzAqgm0UWwRUFAyOzhDxzRZKTGsEYU1DwE-Q,2170
-holado_ais/tests/behave/steps/ais/ais_messages_steps.py,sha256=XMBpCqtyRBQJ2ODRxRN-tVcWr7O72c2o0Yy-0Sd5phE,11741
+holado_ais/tests/behave/steps/ais/ais_messages_steps.py,sha256=SJZlUyAvGOiEPjTa5qxrj_9y8ERcDJkmHcofzonvJDA,11741
 holado_binary/__init__.py,sha256=Gl285tg-QaPE-3etWwZql9sH26G7EnVoQn97B0NMvOI,1248
 holado_binary/ipc/binary.py,sha256=QYwK7jK4dzXRKprHMxnTxFljMy1LZDSXjMJ406yEOHk,5520
 holado_binary/ipc/bit_series.py,sha256=PNuW_OXGV8yeRrMHxMPImR75np52KpcDOfXXdDKObWw,15508
@@ -98,7 +98,7 @@ holado_core/common/inspectors/tools/inspect_builder.py,sha256=v7azgwciXHtO-o7gcg
 holado_core/common/inspectors/tools/inspect_context.py,sha256=lzhhO5HxG00c6uMPyIXEUz0FHA61VCNUZr_39ykZ8lQ,2700
 holado_core/common/inspectors/tools/inspect_parameters.py,sha256=2vXUpnZlP2cCYTvI9ddI6NGhONideoM1hBJ0vGdvPKo,7346
 holado_core/common/resource/persisted_data_manager.py,sha256=Thie2st70tFb2IDWb_3LeLx656WeiW5tpAkI4xc8wQA,6641
-holado_core/common/resource/persisted_method_to_call_manager.py,sha256=LJOCrl2gTa_hyXkt4mLhpsBfDAB3QEIxmcc7gJQop-k,14192
+holado_core/common/resource/persisted_method_to_call_manager.py,sha256=xlP1xBPN0TdYrh1CBNyOU6EnzXp5KyXSJVTQC9ynlLQ,14188
 holado_core/common/resource/resource_manager.py,sha256=VP86iQ7_NZzQQ0uUpeev1PjgiejUuwKbV5RfGCNC5tI,7179
 holado_core/common/resource/table_data_manager.py,sha256=bigQGMwh1m3P6ZEO3wi2ftmvyEwpZhGbNCVtI794ops,6289
 holado_core/common/tables/__init__.py,sha256=i2-gExPOUa_AnmEPgZJQ2lAXeK02PLpPnjEqbsgj1Co,8
@@ -313,7 +313,7 @@ holado_protobuf/tests/behave/steps/ipc/protobuf_steps.py,sha256=Pbw5E-AbTTSKR_i_
 holado_python/__init__.py,sha256=DuWuDU7MxVsAOz1G6TiYRRsIhApFWMNNwA8Xwp0LhtU,1658
 holado_python/common/enums.py,sha256=iwffWOqUdiFaOn83RPmjRVVHakTjQve55sNsbY4x8Ek,1535
 holado_python/common/iterables.py,sha256=p5X6h18W-GSnZ4WHt5Y5g3Ri4TB4B5i5NhyAwb7g1Ww,2064
-holado_python/common/tools/datetime.py,sha256=h6dcKnBikFH5V2EK688zG6poeLPhXYdudiITsraG2aI,13453
+holado_python/common/tools/datetime.py,sha256=bjalKiY_2NKeb3ouhGxcJWGeDHx04DuGwsi1w-88Oh4,13765
 holado_python/common/tools/comparators/boolean_comparator.py,sha256=66AtqQ1u7NLTKAmgZHdnbE8vMPfgwJ2ZrzMiea90jX0,2042
 holado_python/common/tools/comparators/bytes_comparator.py,sha256=VKD5Q734n1k5Q0zX14fYgvM-66ysyRWkjo2fLgleyt0,2412
 holado_python/common/tools/comparators/datetime_comparator.py,sha256=6smSvQ7ErnNuBNHkSbkf4HoSUJU54DNS2ILhxM1FHAk,3487
@@ -336,8 +336,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=irlQEaUfHPFbeDFcvZwtyneZxoM6s6KFLgXa6N_io6E,1237
-holado_python/standard_library/ssl/resources/certificates/tcpbin.key,sha256=fq0j9a8lrCUS8Jo6vS0a_FoZOwO5OfFb2Fa19u3xd9Y,1704
+holado_python/standard_library/ssl/resources/certificates/tcpbin.crt,sha256=phGEtgs44UXM0-8PpQbCDI378uJ4IwA4CKmbgZmgmnE,1237
+holado_python/standard_library/ssl/resources/certificates/tcpbin.key,sha256=jwmluX8OxRIKf9X6KFRAL4ZXQ2Nb07fbmGIydyRz1B8,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
@@ -364,21 +364,22 @@ holado_redis/tests/behave/steps/tools/redis_client_steps.py,sha256=lOh0YlumJcszt
 holado_redis/tools/redis/TODO.txt,sha256=cmFyx6qS6_FgL1Ph0OWRsWch6MQaklfv1j0qBO2ZpZU,202
 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=fZtxvtFc7_BZm3KGZNMYh0p8SJ-znEX89MlEY6Gp3aE,8748
-holado_report/report/execution_historic.py,sha256=M4lYoZwyrSivRa17Q39GOAgROnr0oBvIZX5BNcO5Mnc,6951
-holado_report/report/report_manager.py,sha256=KiKMiZbjYa7-0yH8zs8KQdqz5VyZwwSAHizDYRwGGp8,16624
+holado_report/__init__.py,sha256=dNP5UmrdXFTibffSkWUM0D0NEdhRDq7DPrND4pbY0Io,1917
+holado_report/campaign/campaign_manager.py,sha256=v6_dywd_KGcx6qQuI8EWBq8qS-A_tDXzcP_pHyCur8w,9217
+holado_report/report/execution_historic.py,sha256=bF8TKU0icsGXm6Up4secmJ2Z07oGzMYD5YGUZOLXIAY,6983
+holado_report/report/report_manager.py,sha256=qRENdptYi0ulKsg2mS5pGBhdJ1-iTCB345ESB8DgNsU,20320
 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=WLLlLgLbEyYJNENEoxSkQQSf11DDoKpSa4kdaq7eV8U,6533
-holado_report/report/builders/json_execution_historic_report_builder.py,sha256=M7OGUvkqNRTG5Td7fO96tv1SJEzRzjm0pl1W02v052E,5929
+holado_report/report/builders/detailed_scenario_failed_report_builder.py,sha256=JJ6bpMWk7cOQ2Z1Q-fpbCEJmi2WGEYgJq_Aj1xfxot0,8613
+holado_report/report/builders/failure_report_builder.py,sha256=4yBE_KU1gJFI6wAEBDFTqU5r5R7SeckUls2jHDmKCW4,6983
+holado_report/report/builders/json_execution_historic_report_builder.py,sha256=9urkQcEEgZXeNABFwzBF2iMhxEXMiYGp-cvH9pqAEiE,6271
 holado_report/report/builders/report_builder.py,sha256=5qlhxbdTkSN7p9q6EADkpHQGPDVEHquIhgA3mK2Ck2k,2261
-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_by_category_report_builder.py,sha256=1rzuF4KFPzO5jFuvC_OKvsnNMRrzW3zG5nU5GUSux1U,4274
-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/builders/short_scenario_failed_report_builder.py,sha256=mlLyekgq8hKQ1bcseTUMdNKOaTZVL8qeI7fUyk6nRak,4147
+holado_report/report/builders/summary_by_category_report_builder.py,sha256=aLHgOQI7NcMs0lxA8UnzNm5jAEI2bWIgA5Rh0M0hb3A,4502
+holado_report/report/builders/summary_report_builder.py,sha256=Qzh9VsRINv_XVijnJxpU_5JOHpKsQQo9f94MgkCDSLE,3960
+holado_report/report/builders/summary_scenario_by_category_report_builder.py,sha256=_pqce8vi6gXxPQsw8GNSau-gGlkLCDg9TswNNutt8Io,4227
+holado_report/report/builders/summary_scenario_failed_report_builder.py,sha256=LJ1nNAjC8uRRildxSKps4WyIO5JPZKVlApSN_jXAXeY,3073
+holado_report/report/builders/summary_scenario_report_builder.py,sha256=QKG-LabVsImX2npmSXDAjDDP9q84SAICvf6J4rI9QMQ,4082
 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
@@ -480,7 +481,7 @@ holado_test/tests/behave/steps/__init__.py,sha256=rdqrp-UN7vRplIqORx4sXyKwMUkptR
 holado_test/tests/behave/steps/scenario/exception_steps.py,sha256=ZIE92Dz7a6O_c0jAP_0dj6Hc0tnW6YRgNKd4_aBpeR0,4054
 holado_test/tests/behave/steps/scenario/scenario_steps.py,sha256=RfM5Lh4sduKeYSD1NzUxtQ8705O7nausoz_gnpAJQB0,4616
 holado_test/tests/behave/steps/scenario/tester_steps.py,sha256=zEm36-su8jrqe0uv8ai4xN97j3_p2jmcPv_-jRRu688,2997
-holado_test/tools/test_server/client/rest/test_server_client.py,sha256=WJG-_FLSg1YuRXUBX-5RXd-97XEnUv1UfTvyvQnXLo4,5317
+holado_test/tools/test_server/client/rest/test_server_client.py,sha256=Zoq5zWqWHHnysxMIki8zaQHaR8TFMM6U1xSbjeO7luY,6085
 holado_test/tools/test_server/server/Dockerfile,sha256=CDhwKszWuA_aSHrwruvN5oAU6g67MXbSO-coHmDNL9c,1485
 holado_test/tools/test_server/server/requirements.txt,sha256=c2iNG9IZZogAEC9oSWRTWEF9-OHW0vRtijPNK4P6_xY,45
 holado_test/tools/test_server/server/run_test_server_in_docker.sh,sha256=ISNvFT1dBM6aiw5Iv6yBhInn7L8ZYyz_7EDK_X1eCvk,3121
@@ -489,9 +490,9 @@ holado_test/tools/test_server/server/core/server_manager.py,sha256=PW5ShUdnbdq6E
 holado_test/tools/test_server/server/rest/README,sha256=J_LIXWFxtxc8okQGZ8Kk0dMSRra9oUzbMP_ylCe4pTo,161
 holado_test/tools/test_server/server/rest/initialize_holado.py,sha256=UxNphXyjs-xraorzMWjDe6-QYw_Q3mtykyY-ENYZB1o,3464
 holado_test/tools/test_server/server/rest/logging.conf,sha256=yeNIHFQCYlDmkdLlQ3NCoMuxpUNn6i8ZDAzOUna_2aA,1282
-holado_test/tools/test_server/server/rest/openapi.yaml,sha256=4Juf_QggWo7z9te3_sS96TxxARWU1MtFkJZAilEsxr8,1027
+holado_test/tools/test_server/server/rest/openapi.yaml,sha256=ULzbZMhj-Iw6MGwZ7_7zxkOGiRjpFnqaT6OotgL9sjY,1248
 holado_test/tools/test_server/server/rest/run.py,sha256=OpDBkjBX_ZoNfwTWc2VV7dINALjp7ZrGUUiDaSEHQVU,2395
-holado_test/tools/test_server/server/rest/api/__init__.py,sha256=4QcsiWhFX0sGhJYuoqUUfwEYb6ceIDlFFlU1q3ls7Xc,1442
+holado_test/tools/test_server/server/rest/api/__init__.py,sha256=Y_kSr0l44kBpmWYsRRH93MXSyKM1veegaytzYFXkBA0,1407
 holado_test/tools/test_server/server/rest/api/campaign/__init__.py,sha256=btZb20N5k7_WbowNAC1C7yYDUkwPnUU5QUmh-jO0bhg,1586
 holado_test/tools/test_server/server/rest/api/campaign/scenario.py,sha256=4eTIScEGL0GKD7g6aIPHJVvaVbwz487zlEg9mRQv84Y,1737
 holado_tools/__init__.py,sha256=JzUm55NIkeBynu1RieZ3QfZGw8v4NfFDzz6HS-bN7r8,1798
@@ -500,7 +501,7 @@ holado_tools/scripts/execute_persisted_post_processes/execute_persisted_post_pro
 holado_tools/scripts/execute_persisted_post_processes/initialize_holado.py,sha256=IPYH-GYNiHV5-7ZCCH6CFmPpmACsPrTV74TYz3MRjpA,3102
 holado_tools/tests/behave/steps/__init__.py,sha256=SPh47LYMokcxbFhDa_JnlkIlyQav2D-hddf3J1ZlEbQ,1296
 holado_tools/tests/behave/steps/tools/host_controller/client_steps.py,sha256=FOaeQ5xX4KGv7OVvMh2M8U0a-AfHuUNQU5p4av_K8z0,4786
-holado_tools/tools/host_controller/client/rest/host_controller_client.py,sha256=U7btvQf-kodCIrBvG-DHOgY5Hk9A0-H6jYZZ13zdbr0,6432
+holado_tools/tools/host_controller/client/rest/host_controller_client.py,sha256=OCMXvFcJ1Bz9W3AeG2Rdho3pTrWT48J2sJNQdICE4d0,7218
 holado_tools/tools/host_controller/server/Dockerfile,sha256=wTy-ii7MuJULRiw5_2sUWj8ssw6WUJIhAcLY2KCL0lw,1508
 holado_tools/tools/host_controller/server/requirements.txt,sha256=0RvLV3t2DyBR2FsbAd1WVEcbsVc6FVUN2horQJU4POo,57
 holado_tools/tools/host_controller/server/run_host_controller_in_docker.sh,sha256=KEBTxcxFeViVpixLii1YXBbyZhvJKfmH604jGqBFxHc,3729
@@ -510,9 +511,9 @@ holado_tools/tools/host_controller/server/grpc/proto/compile_proto.py,sha256=Njc
 holado_tools/tools/host_controller/server/grpc/proto/definitions/docker_controler.proto,sha256=n9bsXaQfnZX-R5HvfquCVt3QjpFtDJSH6p8gnTjm06k,1650
 holado_tools/tools/host_controller/server/rest/README,sha256=10hiIdQw69iXubii8ZYZUrYrs2Q2k5QiTKpBBrBK1bc,165
 holado_tools/tools/host_controller/server/rest/initialize_holado.py,sha256=UxNphXyjs-xraorzMWjDe6-QYw_Q3mtykyY-ENYZB1o,3464
-holado_tools/tools/host_controller/server/rest/openapi.yaml,sha256=u9D5Yt5pwVZujeOF5xhUF4W2tjXi2TODWHMFBEmLJjY,6900
+holado_tools/tools/host_controller/server/rest/openapi.yaml,sha256=6MCJFmJ-fPeNOhhgELdVHCnsVej2YoyZ3ECwEMeUIsY,7121
 holado_tools/tools/host_controller/server/rest/run.py,sha256=RQFxhVCH3K3uAHFdCVVKw2MAcVcufSvenVn6f6ABCGA,2009
-holado_tools/tools/host_controller/server/rest/api/__init__.py,sha256=3VgcIa1WhkxMBTNrxKsh4xIqiSMeDxQpbx2cAdME9vg,1459
+holado_tools/tools/host_controller/server/rest/api/__init__.py,sha256=Y_kSr0l44kBpmWYsRRH93MXSyKM1veegaytzYFXkBA0,1407
 holado_tools/tools/host_controller/server/rest/api/config.py,sha256=Ln__1bsigSzJZ-Iy3MQgmiZMnpBxC3TCQE0O72g5cAs,2459
 holado_tools/tools/host_controller/server/rest/api/os.py,sha256=EA3DCxGBCnMd2XJyn9kb6IWmtbaPIyv5UfZypCNzkhY,2123
 holado_tools/tools/host_controller/server/rest/api/docker/__init__.py,sha256=FlLRagAiw1LDxnF0CmW7Y6bVXuj8x6volT8-DuHTTVY,2427
@@ -523,9 +524,9 @@ holado_tools/tools/host_viewer/server/requirements.txt,sha256=0RvLV3t2DyBR2FsbAd
 holado_tools/tools/host_viewer/server/run_host_viewer_in_docker.sh,sha256=XeJfyjPVj34-rK_9K_6C9iD0EiAZ2WVkoD1L5rvZzw4,3606
 holado_tools/tools/host_viewer/server/rest/README,sha256=1FMg-U_D9pUMBVmZJsirOXHFLTciDL5jB-Yqzp9U6uM,163
 holado_tools/tools/host_viewer/server/rest/initialize_holado.py,sha256=UxNphXyjs-xraorzMWjDe6-QYw_Q3mtykyY-ENYZB1o,3464
-holado_tools/tools/host_viewer/server/rest/openapi.yaml,sha256=XP644LfEcDi7R9IV7_FIbRHpmw9Jlgtlfs-8qsc3DGQ,2788
+holado_tools/tools/host_viewer/server/rest/openapi.yaml,sha256=tU9N6eGW7ESxtbODyUeYDdKYUxQSNoTjHiUrvgqr5JM,3007
 holado_tools/tools/host_viewer/server/rest/run.py,sha256=jgJgmFFdppadLBahWU8Yw8-PdA5HJzBTDCPTPHGRzbA,2007
-holado_tools/tools/host_viewer/server/rest/api/__init__.py,sha256=MTjW5ixe0v7jIjWkN_NovDHbHeVlb0VKkJRtC_oWlHc,1456
+holado_tools/tools/host_viewer/server/rest/api/__init__.py,sha256=Y_kSr0l44kBpmWYsRRH93MXSyKM1veegaytzYFXkBA0,1407
 holado_tools/tools/host_viewer/server/rest/api/docker/__init__.py,sha256=FlLRagAiw1LDxnF0CmW7Y6bVXuj8x6volT8-DuHTTVY,2427
 holado_value/__init__.py,sha256=60VyLyWux76dFwn03uH4Fz3R6itf6fqKu0pQUdvwblU,1561
 holado_value/common/tables/value_table.py,sha256=fJgb-HWdlMwHOAx5CS38sPiVrjGelEiQBbG9HuHqe-A,1726
@@ -559,7 +560,7 @@ test_holado/Dockerfile_test_holado,sha256=zO6OUFnC1X9ZG7fPWWWfcWgZwnxif4WDE4ZDEm
 test_holado/__init__.py,sha256=TIHAHrF05rvz6-VDKuDBSBjasD6PxTxXvcXjMEC3D6E,54
 test_holado/__main__.py,sha256=PVdCX8V_RGRzbQQKVxf7eyt8a10XfUJ1pcaajGgIlus,1509
 test_holado/build_docker_image_to_test_holado_in_docker.sh,sha256=B3hbi0yKnEC-t9S18o6ZR27AU1bqiuptwOqm6H7tv8s,142
-test_holado/environment.py,sha256=SLGJ2v1BoyP_s_KucvuQJLnWPzPJAD6cS4C8eBNaJW8,2381
+test_holado/environment.py,sha256=2K_VLB92bDfHh6e1EHVBp30Y8cgeVIjUI8C2ezPWXqA,2661
 test_holado/initialize_holado.py,sha256=IPYH-GYNiHV5-7ZCCH6CFmPpmACsPrTV74TYz3MRjpA,3102
 test_holado/logging.conf,sha256=vsCMsRnvSMHl6nBmRqG7kBYC3qshAcxiAg5iUUw1Udw,1318
 test_holado/test_holado_session_context.py,sha256=qOB_i2k8mYjkR3-q2uv0B04xFc1K3p-K20ttYwe1Z18,1364
@@ -679,7 +680,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.11.3.dist-info/METADATA,sha256=WqOxGK8nQl9F-5TCd1mOpqI4VYDpMhStD355pcPKBWI,7660
-holado-0.11.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-holado-0.11.3.dist-info/licenses/LICENSE,sha256=IgGmNlcFHnbp7UWrLJqAFvs_HIgjJDTmjCNRircJLsk,1070
-holado-0.11.3.dist-info/RECORD,,
+holado-0.11.5.dist-info/METADATA,sha256=3OtsrMJ9qwxe0NGZLLS2F7eVdjCalvrbe39uaU6nxkc,7660
+holado-0.11.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+holado-0.11.5.dist-info/licenses/LICENSE,sha256=IgGmNlcFHnbp7UWrLJqAFvs_HIgjJDTmjCNRircJLsk,1070
+holado-0.11.5.dist-info/RECORD,,

holado_ais/ais/ais_messages.py CHANGED Viewed

@@ -93,7 +93,7 @@ class AISMessages(object):
             msg_dict = msg.asdict(enum_as_int=enum_as_int, ignore_spare=ignore_spare)
             # 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])
+            tag_block_str, _ = self.split_sentence_to_tag_block_and_message(sentences[0])
             if tag_block_str is None:
                 tag_block_dict = None
             else:
@@ -283,7 +283,7 @@ class AISMessages(object):
         return res
-    def split_sentence_to_tab_block_and_message(self, ais_sentence):
+    def split_sentence_to_tag_block_and_message(self, ais_sentence):
         if isinstance(ais_sentence, str):
             split_char = '\\'
         elif isinstance(ais_sentence, bytes):

holado_ais/tests/behave/steps/ais/ais_messages_steps.py CHANGED Viewed

@@ -208,7 +208,7 @@ if AISMessages.is_available():
         msg_var_name = StepTools.evaluate_variable_name(msg_var_name)
         ais_sentence = StepTools.evaluate_scenario_parameter(ais_sentence)
-        tb, msg = __get_ais_messages().split_sentence_to_tab_block_and_message(ais_sentence)
+        tb, msg = __get_ais_messages().split_sentence_to_tag_block_and_message(ais_sentence)
         __get_variable_manager().register_variable(tb_var_name, tb)
         __get_variable_manager().register_variable(msg_var_name, msg)

holado_core/common/resource/persisted_method_to_call_manager.py CHANGED Viewed

@@ -99,7 +99,7 @@ class PersistedMethodToCallManager(PersistedDataManager):
         @param delete_on_fail: If True, delete method after its fail
         @param delete_on_success_after_fail: If True, delete method after its success even if it has previously failed
         """
-        if self.__scope_name is not any_value:
+        if self.__scope_name is any_value:
             raise TechnicalException("To add a method to call, the scope name must be specified")
         # Define persisted data that can define if method is already persisted

holado_python/common/tools/datetime.py CHANGED Viewed

@@ -38,6 +38,8 @@ EPOCH_JULIAN_NASA = datetime.datetime(year=1968, month=5, day=24, tzinfo=datetim
 FORMAT_DATETIME_ISO = '%Y-%m-%dT%H:%M:%S.%fZ'
 FORMAT_DATETIME_ISO_SECONDS = '%Y-%m-%dT%H:%M:%SZ'
 FORMAT_DATETIME_HUMAN_SECOND = '%Y-%m-%d %H:%M:%S'
+FORMAT_TIME_ISO = '%H:%M:%S.%f'
+FORMAT_TIME_ISO_SECONDS = '%H:%M:%S'
 TIMEZONE_LOCAL = datetime.datetime.now().astimezone().tzinfo
 TIMEZONE_UTC = datetime.timezone.utc
@@ -331,8 +333,9 @@ class DateTime(object):
         return dt_src - DateTime.utc_to_tai_timedelta()
+    @classmethod
+    def truncate_datetime(cls, dt, precision_nanoseconds=1):
+        total_us = cls.datetime_to_timestamp(dt) * 1e9
+        trunc_total_us = total_us // precision_nanoseconds * precision_nanoseconds
+        return cls.timestamp_to_datetime(trunc_total_us / 1e9)

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

@@ -2,20 +2,20 @@
 MIIDZTCCAk2gAwIBAgIBKjANBgkqhkiG9w0BAQsFADCBizELMAkGA1UEBhMCVVMx
 CzAJBgNVBAgMAkNBMRYwFAYDVQQHDA1TYW4gRnJhbmNpc2NvMQ8wDQYDVQQKDAZ0
 Y3BiaW4xDDAKBgNVBAsMA29wczETMBEGA1UEAwwKdGNwYmluLmNvbTEjMCEGCSqG
-SIb3DQEJARYUaGFycnliYWdkaUBnbWFpbC5jb20wHhcNMjUxMDIyMDkwOTA0WhcN
-MjUxMDIzMDkwOTA0WjAcMRowGAYDVQQDDBF0Y3BiaW4uY29tLWNsaWVudDCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKxBxWBybXhqGWMhtI3vpad9SP9k
-0IsZSIHRRPI27FU/kfoTfMrQayKVggdlyenD3OojsEfNd8mvjz9ApIpogouYgZD4
-0zqHT8G4B15RASWP2K20WWNuKr7HgvraPwTbjDbtg8XU4kwgGOs1XftPhSi9N2DU
-/O6sEkgprqpkNAAZvn8bHRTpDB4FMqbTmH3ojawtz6PeW4I9YJLvbYFYwmmYrNpD
-L5pLnfyt6MS5/x5MGlpvcCaiQU3hWS8JOKpgP6XrIIsu65fQC+UU4MJIYg/StGPj
-rJ7eRBUoi11tGMCfF38AtYUgdNXdVjDM93F+Oks8tVGSZ9d7cwQknKMUgwECAwEA
-AaNCMEAwHQYDVR0OBBYEFBOraPFlFALkITNnlh3s4B564QvFMB8GA1UdIwQYMBaA
-FOLuMowBSAZfV5v82LmlaIIOvU/DMA0GCSqGSIb3DQEBCwUAA4IBAQA/LgtD4+3x
-myJUWPz8TAJ41zIK2AxUgLmlinQnKzvXdHFjJZtYQPxadOdZon7q3Jw7J2FpaQLh
-cc1h9pKIVaPXiR6I4CStKzw6peBtKJ2oN6uaZpSCQza+TC7Bg50uMbJmW+ph8tkY
-t2wmNFh6Q3+yC8kxQM5u0Cg2NDYGepwNhdUfVy1HpgLaM8Gr5gPSD01p1fyb7pcJ
-MWBK0kK6f0JcxZsIvSVuDX4Fc51LppEqv1THL5G4q3sWacksy0VG/izxLgB3hXs1
-VJBUWAMgbvAjAV15XCmvC3k5mMlyIrfXRO8uPpD5iIDdgQQJ5/Bo4UPFGJPOkLV3
-OEqtvNchmuBf
+SIb3DQEJARYUaGFycnliYWdkaUBnbWFpbC5jb20wHhcNMjUxMDI5MTIwMzM4WhcN
+MjUxMDMwMTIwMzM4WjAcMRowGAYDVQQDDBF0Y3BiaW4uY29tLWNsaWVudDCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN7qgObpLDNcyQwO1SAw580Zs9qE
+QbyBNvKeYsI02n9TcLbqo/4PUtFgUeI4uiWp2AgXrQOSsYpOfUibqPZX2ERIlTsP
+ZLintHRQ35oWLzocteGv8rAEy3X1mG9LULOEFXmn8Ae410z1ULh0tOE65XW1jMAH
+xgJCMxDwdH8ZhPVD+4KePgluv7cz6nWNsroN+injaJCIDNZUBD0MMkR41gvv86AR
+Vm60sVSlnmoExD9xJaPMfA6Wh3Q0fQSazrAtznGgLl/C7Yb6xqBT1V5wTofctzs4
+bdKJmr8Mq5dOy8J3kBt6KbQNpw+/OP+uDgPVO4HannXpdoCXrCgmeCElmKMCAwEA
+AaNCMEAwHQYDVR0OBBYEFEioQrAa0ViJpdokrFKGzn1HHlNvMB8GA1UdIwQYMBaA
+FOLuMowBSAZfV5v82LmlaIIOvU/DMA0GCSqGSIb3DQEBCwUAA4IBAQCQS60nEPW0
+cJsl1jGTR+F3oUiWpdnZtJO6jAuQAZ1s7/dwgK3vUMesWwSwZIIdyZcHSfAn/Su6
+HcJMUkL7okUmS5hM/cQ8VNTiyImqmxP84NIzP+ZZpBN7/gkrwVRrQbcsfLGYE6NO
+VfozTdT7KMYZVjdyKuKV0gS2OFEhGH1fWrX04lXGmfOGLLCkNqjg0SSO4LThJCFV
+vOHEGYADuKdXpRV3ffN0NiBmhcHKapHynqVbkAhK1dC6s7ml/xIBuYn5o5X5I9er
+g3Jmhz/XZvWbsi5OwzMMP2Z9w2FaEvilhJriIy9S+BW5eb3C9kpRZk4tvZVFrFVW
+hL8GIS9XOL4C
 -----END CERTIFICATE-----

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

@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCsQcVgcm14ahlj
-IbSN76WnfUj/ZNCLGUiB0UTyNuxVP5H6E3zK0GsilYIHZcnpw9zqI7BHzXfJr48/
-QKSKaIKLmIGQ+NM6h0/BuAdeUQElj9ittFljbiq+x4L62j8E24w27YPF1OJMIBjr
-NV37T4UovTdg1PzurBJIKa6qZDQAGb5/Gx0U6QweBTKm05h96I2sLc+j3luCPWCS
-722BWMJpmKzaQy+aS538rejEuf8eTBpab3AmokFN4VkvCTiqYD+l6yCLLuuX0Avl
-FODCSGIP0rRj46ye3kQVKItdbRjAnxd/ALWFIHTV3VYwzPdxfjpLPLVRkmfXe3ME
-JJyjFIMBAgMBAAECggEBAIfNwqJrFEseuq0g4YwVJ3CIoYhYHuHLKRLPvZ+IFYKP
-/7I8suHittQpMr5KTYly1TPytwOkxY/ITRL9D7ve8SzFK0D0KvO1wfdj8ss06caH
-RbiMuvxc2m5WNLk4Xv6haEXVs1HAqDiEBaFKDbIX209m/cXlpRM1raQe2ImVPjnk
-xtdzpLYgRIf4MHtjAI22knlsSgypay6cpUF+PArmgepmsIaw+ioy5ItSWTmvq8QU
-9KhnEtdn8UOciLiP2rnLgql+qF8RCL9R/NTTZo+kC00AMEliQBFaLHsLHuFuAQwT
-6X9ueOtEOAewWhhelScbfub5ZlVwvvWhawLqoyGiRZECgYEA1TAlMXhZCrtAIyk/
-Q0dCbrMl24Mr6Yv+PC8Z9N/EC5UrddPwk2W4/L+e8kU6XyyJ4Gw3ZQgJd8gTb1/0
-zpnaFXdK2VhyHxWz3UNzQ4lRuMVB1qK/5/yByqRhysKczzhufhf2XuIcDqiYsWHg
-C4VwpQAQSp9Vbcpd1biXEv1O8AMCgYEAztliCAXlExU3DmcRWbV0RpIjREAm9f6w
-uX8RRuFYZsHVY1pEkv5iACjofeZz9s/EC8QGo4ixcELEou5pFX1HYFyjjw2CwBmS
-a63l5KJyQcChF2tkDaEFsspM0Tri001h8LpChep6cZK4CkHkJ3MTXD4mqa+vpYgr
-RDUwZhdYu6sCgYBO0nE9/Dg3zonlNi/sySEX2ubpZXNL83W5fNTFBCLxAWNDOmxd
-oyOlV5gGDXCKleYYcwp8MV+GyRPefwT9ikbm3uduutPfCGArM/AfDVuIzG4OVLhN
-pr+6U9LQa+ocd8nqlyOBa2piRRXHp991gw3mA8MCRC0K3eKZzZkV7VBNTwKBgCTu
-UP9ntgebMRJEOqfOquzyqJNF9O7Uw07LLhV+pF7sWqH7euTXwD2REDlyTOATJkiH
-fjvyauPFOABzGpX4oSbGQ3mGCwMrTaYmDTat/kJZFynsRZfdWPwb/G0a22aomUT2
-rGvmemgOrwc9znNwq1M70YFYWb7vOfJaoMKJhpEzAoGBAKQCWrZWZRBEeid9QsQ3
-SVedImc8PN5IOC0vyydrkF5qV8LYsPmqMzfkOx0XAx6xrEUyjtSzZRgz/na1EzE6
-juGFIBW30Dx3Ej2A/pKQ7/Yuhdrhl5Nd/Dv5sBgtziBeC+5PYI0XqCV7nIGGOu2/
-8SjHFk7En45EM/cT8l/VahAv
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDe6oDm6SwzXMkM
+DtUgMOfNGbPahEG8gTbynmLCNNp/U3C26qP+D1LRYFHiOLolqdgIF60DkrGKTn1I
+m6j2V9hESJU7D2S4p7R0UN+aFi86HLXhr/KwBMt19ZhvS1CzhBV5p/AHuNdM9VC4
+dLThOuV1tYzAB8YCQjMQ8HR/GYT1Q/uCnj4Jbr+3M+p1jbK6Dfop42iQiAzWVAQ9
+DDJEeNYL7/OgEVZutLFUpZ5qBMQ/cSWjzHwOlod0NH0Ems6wLc5xoC5fwu2G+sag
+U9VecE6H3Lc7OG3SiZq/DKuXTsvCd5Abeim0DacPvzj/rg4D1TuB2p516XaAl6wo
+JnghJZijAgMBAAECggEAWv1/tkGRYDnMetaHGke8JpUKO/TmXEqmIiyShVFLqtNl
+W9S1MdwRYxOc+OlM2ljUrKD1Z1L2k0zsiLm5IyzCQ0UZXO0woMsbtqrYSq4pgt/7
+Qe8u8bhTUIf6O9uTSmNs3Ka3LH+/qlMsKs7AknsW9JAxrqS9p2hcLdrowoSpJ+9f
+7InJg8+vPoO6hCdumRcCOsy1jREP2Bb2sWZDLOmdlXBsdPdgQBsbbvJ4tVmhDwjo
+KuTKyVtQvkwxc8qqCf0ocXSoKPmh3WTztqfs3VyGYyDZHw0kI0sH2wULHQbyrhrd
+cFmq65VzrjkLeBXn6gzspQ1tjEIn4rN4QZeT5J+HoQKBgQDyf5Z+rnzb1PglFN5H
+HuY8hY9hYX0obnynGgg/Lo8J78RsF0YwDK+1I9641ZnbZfef2Au+UD/EFWLT2kXI
+MgkUrH103R3BXCRBGDrqfNEJE+QoM3Vo6LHP+pOcDI3EuLifLpu11iNxeza+stIP
+GG7MJxMxJ8Kk/y+0ydJP7iOasQKBgQDrU801enTD7bBPmqPaV5FlrcFISe/s8Lz4
++fikZsx2GMNdJXExPWvfroijryveq6e2vMlFWGHJWuy59dwzEmfOLSrTBtpkMDVW
+Z4j0eh8p5T7iYjjUlQZWfDGS0afVS0ik990SbOb9yD2z6KasV7sopOB0pfTwhbpt
+2cyPDYdVkwKBgEMO60QO5nI4G4LNmYYbUlnMKVEpj1295/Shq0QlkOKTjkLB0OP6
+riAuUinUz54vPWHTcbPoJyoHK/QfuQpaY852wJ6vgsn0vAXQOIKdj4SuHnrLeB1R
+s9IqneUaR53t4wgJ8H9BPz3jb8keVB5eiE0mRRVjxFyyQLQC14jI9smRAoGBAKKX
+zyRRDJZHBtepb+avND19lRr+QvCB0P9xrzLf+Arsxyb3dMLhvkPZUn1NzdDW51Ui
+ESqBi2bVFNTTo6YB5IkWugz+IiyxBllBxeWs7xVCWHWQCdYPdUaSHqpjg0Oi9XlN
+7IgLiHn2PXOtnmNbZmwJpy/RbnA05X96yZRZc5VTAoGBAOlOjnENg8STyhKSCj+9
+wwYOAx/ks6LBRVbeP+mz13jxbyWQeTZyxzghcTWkVHubAR8DVacgtRMqaZz/WqIY
+LROx47E/N7C3vTW4RLdPOT0hHVpEEoxzsUW2fKalvCyX8xDN9bO1n6OKBpqAocfk
+CPXz80n1EOuohfZnmD8rTQf0
 -----END PRIVATE KEY-----

holado_report/__init__.py CHANGED Viewed

@@ -18,6 +18,7 @@ def configure_module():
     from holado_python.common.tools.datetime import TIMEZONE_UTC
     Config.report_timezone = TIMEZONE_UTC
+    Config.report_compact_datetime_period = True
 def dependencies():
     return ["holado_multitask"]

holado_report/campaign/campaign_manager.py CHANGED Viewed

@@ -18,6 +18,7 @@ from holado_python.common.tools.datetime import DateTime, TIMEZONE_LOCAL
 import os
 from holado_system.system.filesystem.file import File
 import re
+from holado_core.common.exceptions.technical_exception import TechnicalException
 logger = logging.getLogger(__name__)
@@ -179,13 +180,21 @@ class CampaignManager(object):
         file_path = os.path.join(report_path, 'report_summary_scenario_all.txt')
         lines = File(file_path, mode='rt').readlines(strip_newline=True)
+        regex_line_period = re.compile(r"^\[.+ - ([^\]]+)\] (.+) - (.*)$")
+        regex_line_time = re.compile(r"^(.+) - (.+) - (.+)$")
+        regex_status = re.compile(r"^(.*?)(?: \(.*\)| => .*)?$")
         for line in lines:
-            parts = line.split(' - ')
-            status_dt_str = parts[0]
-            scenario_name = parts[1]
-            status_info = parts[-1]
+            m = regex_line_period.match(line)
+            if not m:
+                m = regex_line_time.match(line)
+            if not m:
+                raise TechnicalException(f"Unexpected line format in {file_path}: [{line}]")
+            status_dt_str = m.group(1)
+            scenario_name = m.group(2)
+            status_info = m.group(3)
-            m = re.match(r"^(.*?)(?: \(.*\)| => .*)?$", status_info)
+            m = regex_status.match(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/detailed_scenario_failed_report_builder.py CHANGED Viewed

@@ -33,10 +33,10 @@ class DetailedScenarioFailedReportBuilder(ReportBuilder):
     def after_scenario(self, scenario, scenario_report=None):
         from holado_report.report.report_manager import ReportManager
-        category_validation, status_validation, step_failed, step_number = ReportManager.get_current_scenario_status_information(scenario)
+        category_validation, status_validation, step_failed, step_number, scenario_context, step_context = ReportManager.get_current_scenario_status_information(scenario)
         if status_validation != "Passed":
-            self.__file_fail_add_scenario(scenario, scenario_report, category_validation, status_validation, step_failed, step_number)
+            self.__file_fail_add_scenario(scenario, scenario_report, category_validation, status_validation, step_failed, step_number, scenario_context, step_context)
     def after_all(self):
         # Manage file fail
@@ -44,13 +44,13 @@ class DetailedScenarioFailedReportBuilder(ReportBuilder):
             self.__file_fail.close()
             self.__file_fail = None
-    def __file_fail_add_scenario(self, scenario, scenario_report, category_validation, status_validation, step_failed, step_number):
+    def __file_fail_add_scenario(self, scenario, scenario_report, category_validation, status_validation, step_failed, step_number, scenario_context, step_context):
         if self.__is_format_xml:
-            self.__file_fail_add_scenario_xml(scenario, scenario_report, category_validation, status_validation, step_failed, step_number)
+            self.__file_fail_add_scenario_xml(scenario, scenario_report, category_validation, status_validation, step_failed, step_number, scenario_context, step_context)
         else:
-            self.__file_fail_add_scenario_txt(scenario, scenario_report, category_validation, status_validation, step_failed, step_number)
+            self.__file_fail_add_scenario_txt(scenario, scenario_report, category_validation, status_validation, step_failed, step_number, scenario_context, step_context)
-    def __file_fail_add_scenario_xml(self, scenario, scenario_report, category_validation, status_validation, step_failed, step_number):
+    def __file_fail_add_scenario_xml(self, scenario, scenario_report, category_validation, status_validation, step_failed, step_number, scenario_context, step_context):
         from holado_report.report.report_manager import ReportManager
         self.__open_file_if_needed()
@@ -59,6 +59,7 @@ class DetailedScenarioFailedReportBuilder(ReportBuilder):
         msg_list.append(f"    <file>{scenario.filename} - l.{scenario.line}</file>")
         msg_list.append(f"    <feature>{scenario.feature.name}</feature>")
         msg_list.append(f"    <scenario>{scenario.name}</scenario>")
+        msg_list.append(f"    <scenario_period>{ReportManager.format_context_period(scenario_context)}</scenario_period>")
         msg_list.append(f"    <report>{scenario_report.report_path}</report>")
         msg_list.append(f"    <tags>-t " + " -t ".join(scenario.feature.tags + scenario.tags) + "</tags>")
         if category_validation:
@@ -68,6 +69,8 @@ class DetailedScenarioFailedReportBuilder(ReportBuilder):
             msg_list.append(f"    <failure>")
             msg_list.append(f"        <step_number>{step_number}</step_number>")
             msg_list.append(f"        <step_line>{step_failed.line}</step_line>")
+            if step_context is not None:
+                msg_list.append(f"        <step_period>{ReportManager.format_context_period(step_context)}</step_period>")
             step_descr = ReportManager.get_step_description(step_failed)
             if "\n" in step_descr:
                 msg_list.append(f"        <step>")
@@ -104,7 +107,7 @@ class DetailedScenarioFailedReportBuilder(ReportBuilder):
         self.__file_fail.write(msg)
         self.__file_fail.flush()
-    def __file_fail_add_scenario_txt(self, scenario, scenario_report, category_validation, status_validation, step_failed, step_number):
+    def __file_fail_add_scenario_txt(self, scenario, scenario_report, category_validation, status_validation, step_failed, step_number, scenario_context, step_context):
         from holado_report.report.report_manager import ReportManager
         self.__open_file_if_needed()
@@ -113,6 +116,7 @@ class DetailedScenarioFailedReportBuilder(ReportBuilder):
         msg_list.append(f"    Feature: {scenario.feature.name}")
         msg_list.append(f"    Scenario: {scenario.name}")
         msg_list.append(f"    Report: {scenario_report.report_path}")
+        msg_list.append(f"    Scenario period: {ReportManager.format_context_period(scenario_context)}")
         msg_list.append(f"    Tags: -t " + " -t ".join(scenario.feature.tags + scenario.tags))
         if category_validation:
             msg_list.append(f"    Validation category: {category_validation}")
@@ -120,6 +124,7 @@ class DetailedScenarioFailedReportBuilder(ReportBuilder):
         if step_failed is not None:
             msg_list.append(f"    Failure:")
             msg_list.append(f"        Step number-line: {step_number} - l.{step_failed.line}")
+            msg_list.append(f"        Step period: {ReportManager.format_context_period(step_context)}")
             step_descr = ReportManager.get_step_description(step_failed)
             if "\n" in step_descr:
                 msg_list.append(f"        Step:")

holado_report/report/builders/failure_report_builder.py CHANGED Viewed

@@ -41,7 +41,7 @@ class FailureReportBuilder(ReportBuilder):
     def after_scenario(self, scenario, scenario_report=None):
         from holado_report.report.report_manager import ReportManager
-        category_validation, status_validation, step_failed, step_number = ReportManager.get_current_scenario_status_information(scenario)
+        category_validation, status_validation, step_failed, step_number, scenario_context, step_context = ReportManager.get_current_scenario_status_information(scenario)
         if status_validation != "Passed":
             step_error_message = ReportManager.get_step_error_message(step_failed).strip()
@@ -51,19 +51,21 @@ class FailureReportBuilder(ReportBuilder):
             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}")
+                msg_list.append(f"scenario in {ReportManager.format_scenario_short_description(scenario)} - {ReportManager.format_step_short_description(step_failed, step_number)} - {status_validation}{category_str}")
                 msg_list.append(f"    Feature/Scenario: {scenario.feature.name}  =>  {scenario.name}")
                 msg_list.append(f"    Report: {scenario_report.report_path}")
                 msg_list.append(f"    Tags: -t " + " -t ".join(scenario.feature.tags + scenario.tags))
+                msg_list.append(f"    Scenario/Step periods: {ReportManager.format_context_period(scenario_context)} -> {ReportManager.format_context_period(step_context)}")
                 msg_scenario = "\n".join(msg_list)
                 self.__failures[step_error_message].append(msg_scenario)
             elif self.__file_format in ['json', 'xml']:
                 scenario_info = {
-                    'title': f"{scenario.filename} - l.{scenario.line} - step {step_number} (l.{step_failed.line}) - {status_validation}{category_str}",
+                    'title': f"{ReportManager.format_scenario_short_description(scenario)} - {ReportManager.format_step_short_description(step_failed, step_number)} - {status_validation}{category_str}",
                     'scenario': f"{scenario.feature.name}  =>  {scenario.name}",
                     'report': scenario_report.report_path,
                     'tags': "-t " + " -t ".join(scenario.feature.tags + scenario.tags),
+                    'periods': f"{ReportManager.format_context_period(scenario_context)} -> {ReportManager.format_context_period(step_context)}"
                     }
                 self.__failures[step_error_message].append(scenario_info)
             else:

holado_report/report/builders/json_execution_historic_report_builder.py CHANGED Viewed

@@ -15,6 +15,7 @@ import json
 import logging
 from holado_report.report.builders.report_builder import ReportBuilder
 import weakref
+from holado_python.common.tools.datetime import FORMAT_DATETIME_ISO, DateTime
 logger = logging.getLogger(__name__)
@@ -51,10 +52,10 @@ class JsonExecutionHistoricReportBuilder(ReportBuilder):
             'tags': [str(tag) for tag in feature.tags],
             'status': feature.status.name,
             'duration': feature.duration,
-            'start_date': feature_context.start_datetime.isoformat()
+            'start_date': DateTime.datetime_2_str(feature_context.start_datetime, dt_format=FORMAT_DATETIME_ISO)
             }
         if feature_context.end_datetime:
-            res['end_date'] = feature_context.end_datetime.isoformat()
+            res['end_date'] = DateTime.datetime_2_str(feature_context.end_datetime, dt_format=FORMAT_DATETIME_ISO)
         res.update({
             'filename': feature.filename,
             'report': feature_report.report_path
@@ -77,10 +78,10 @@ class JsonExecutionHistoricReportBuilder(ReportBuilder):
             'tags': [str(tag) for tag in scenario.tags],
             'status': scenario.status.name,
             'duration': scenario.duration,
-            'start_date': scenario_context.start_datetime.isoformat()
+            'start_date': DateTime.datetime_2_str(scenario_context.start_datetime, dt_format=FORMAT_DATETIME_ISO)
             }
         if scenario_context.end_datetime:
-            res['end_date'] = scenario_context.end_datetime.isoformat()
+            res['end_date'] = DateTime.datetime_2_str(scenario_context.end_datetime, dt_format=FORMAT_DATETIME_ISO)
         res.update({
             'filename': scenario.filename,
             'line': scenario.line,
@@ -96,9 +97,9 @@ class JsonExecutionHistoricReportBuilder(ReportBuilder):
         if eh_step.step_context is not None:
             if eh_step.step_context.status is not None:
                 res['status'] = eh_step.step_context.status
-            res['start_date'] = eh_step.step_context.start_datetime.isoformat()
+            res['start_date'] = DateTime.datetime_2_str(eh_step.step_context.start_datetime, dt_format=FORMAT_DATETIME_ISO)
             if eh_step.step_context.end_datetime:
-                res['end_date'] = eh_step.step_context.end_datetime.isoformat()
+                res['end_date'] = DateTime.datetime_2_str(eh_step.step_context.end_datetime, dt_format=FORMAT_DATETIME_ISO)
         res['description'] = eh_step.step_description
         if eh_step.sub_steps:

holado_report/report/builders/short_scenario_failed_report_builder.py CHANGED Viewed

@@ -32,10 +32,10 @@ class ShortScenarioFailedReportBuilder(ReportBuilder):
     def after_scenario(self, scenario, scenario_report=None):
         from holado_report.report.report_manager import ReportManager
-        category_validation, status_validation, step_failed, step_number = ReportManager.get_current_scenario_status_information(scenario)
+        category_validation, status_validation, step_failed, step_number, scenario_context, step_context = ReportManager.get_current_scenario_status_information(scenario)
         if status_validation != "Passed":
-            self.__file_fail_add_scenario(scenario, scenario_report, category_validation, status_validation, step_failed, step_number)
+            self.__file_fail_add_scenario(scenario, scenario_report, category_validation, status_validation, step_failed, step_number, scenario_context, step_context)
     def after_all(self):
         # Manage file fail
@@ -43,20 +43,18 @@ class ShortScenarioFailedReportBuilder(ReportBuilder):
             self.__file_fail.close()
             self.__file_fail = None
-    def __file_fail_add_scenario(self, scenario, scenario_report, category_validation, status_validation, step_failed, step_number):
+    def __file_fail_add_scenario(self, scenario, scenario_report, category_validation, status_validation, step_failed, step_number, scenario_context, step_context):
         from holado_report.report.report_manager import ReportManager
         self.__open_file_if_needed()
         msg_list = []
         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:
-            msg_list.append(f"scenario in {scenario.filename} at l.{scenario.line} - step ? (missing step implementation ?) - {status_validation}{category_str}")
+        msg_list.append(f"scenario in {ReportManager.format_scenario_short_description(scenario)} - {ReportManager.format_step_short_description(step_failed, step_number)} - {status_validation}{category_str}")
         msg_list.append(f"    Feature/Scenario: {scenario.feature.name}  =>  {scenario.name}")
         msg_list.append(f"    Report: {scenario_report.report_path}")
         msg_list.append(f"    Tags: -t " + " -t ".join(scenario.feature.tags + scenario.tags))
+        msg_list.append(f"    Scenario/Step periods: {ReportManager.format_context_period(scenario_context)} -> {ReportManager.format_context_period(step_context, dt_ref=scenario_context.start_datetime)}")
         step_error_message = ReportManager.get_step_error_message(step_failed)
         if step_error_message:
             if "\n" in step_error_message:

holado_report/report/builders/summary_by_category_report_builder.py ADDED Viewed

@@ -0,0 +1,86 @@
+#################################################
+# HolAdo (Holistic Automation do)
+#
+# (C) Copyright 2021-2025 by Eric Klumpp
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+# The Software is provided “as is”, without warranty of any kind, express or implied, including but not limited to the warranties of merchantability, fitness for a particular purpose and noninfringement. In no event shall the authors or copyright holders be liable for any claim, damages or other liability, whether in an action of contract, tort or otherwise, arising from, out of or in connection with the software or the use or other dealings in the Software.
+#################################################
+import logging
+from holado_report.report.builders.report_builder import ReportBuilder
+from holado_system.system.filesystem.file import File
+logger = logging.getLogger(__name__)
+class SummaryByCategoryReportBuilder(ReportBuilder):
+    def __init__(self, filepath):
+        self.__filepath = filepath
+        self.__counter_by_category = {}
+        self.__categories_order = [
+                'Regression',
+                'Always Failed',
+                'Random',
+                'Regression but Not Relevant',
+                'Always Not Relevant',
+                'Random but Not Relevant',
+                'Always Success',
+                'Fixed',
+                'Unknown'
+            ]
+    def build(self):
+        '''
+        The file is built after each scenario
+        '''
+        pass
+    def after_scenario(self, scenario, scenario_report=None):
+        from holado_report.report.report_manager import ReportManager
+        category_validation, _, _, _, _, _ = ReportManager.get_current_scenario_status_information(scenario)
+        if category_validation is not None:
+            ind = category_validation.find(' (')
+            category = category_validation[:ind] if ind > 0 else category_validation
+            if category not in self.__counter_by_category:
+                self.__counter_by_category[category] = 0
+            self.__counter_by_category[category] += 1
+            # Update categories order with unexpected category
+            if category not in self.__categories_order:
+                self.__categories_order.append(category)
+            self.__update_file()
+    def __update_file(self):
+        list_by_group = {
+            'Success': [(k,self.__counter_by_category[k]) for k in self.__categories_order
+                        if k in self.__counter_by_category and k in ['Always Success', 'Fixed']],
+            'Failed': [(k,self.__counter_by_category[k]) for k in self.__categories_order
+                       if k in self.__counter_by_category and k in ['Regression', 'Always Failed', 'Random']],
+            'Not Relevant': [(k,self.__counter_by_category[k]) for k in self.__categories_order
+                             if k in self.__counter_by_category and k in ['Regression but Not Relevant', 'Always Not Relevant', 'Random but Not Relevant']]
+            }
+        others_list = [(k,v) for k,v in self.__counter_by_category.items()
+                       if k not in ['Always Success', 'Fixed', 'Regression', 'Always Failed', 'Random', 'Regression but Not Relevant', 'Always Not Relevant', 'Random but Not Relevant']]
+        lines = []
+        for group_name, group_list in list_by_group.items():
+            if group_list:
+                lines.append(f"{group_name:>12s}: {sum([x[1] for x in group_list]):5d}  ({' ; '.join([f'{x[0]}: {x[1]}' for x in group_list])})")
+            else:
+                lines.append(f"{group_name:>12s}: {0:5d}")
+        if others_list:
+            lines.append(f"{'Others':>12s}: {sum([x[1] for x in others_list]):5d}  ({' ; '.join([f'{x[0]}: {x[1]}' for x in others_list])})")
+        with File(self.__filepath, mode='wt', auto_flush=False) as fout:
+            fout.writelines(lines)

holado_report/report/builders/summary_report_builder.py CHANGED Viewed

@@ -63,7 +63,7 @@ class SummaryReportBuilder(ReportBuilder):
     def after_scenario(self, scenario, scenario_report=None):
         from holado_report.report.report_manager import ReportManager
-        _, status_name, _, _ = ReportManager.get_current_scenario_status_information(scenario)
+        _, status_name, _, _, _, _ = ReportManager.get_current_scenario_status_information(scenario)
         if status_name not in self.__scenarios:
             self.__scenarios[status_name] = 0

holado_report/report/builders/summary_scenario_by_category_report_builder.py CHANGED Viewed

@@ -44,7 +44,7 @@ class SummaryScenarioByCategoryReportBuilder(ReportBuilder):
     def after_scenario(self, scenario, scenario_report=None):
         from holado_report.report.report_manager import ReportManager
-        category_validation, status_validation, step_failed, step_number = ReportManager.get_current_scenario_status_information(scenario)
+        category_validation, status_validation, step_failed, step_number, scenario_context, step_context = ReportManager.get_current_scenario_status_information(scenario)
         if category_validation is not None:
             ind = category_validation.find(' (')
@@ -56,10 +56,7 @@ class SummaryScenarioByCategoryReportBuilder(ReportBuilder):
             # Add scenario information into category
             category_str = f" => {category_validation}" if category_validation else ""
-            if step_failed is not None:
-                scenario_txt = f"scenario in {scenario.filename} at l.{scenario.line} - step {step_number} (l.{step_failed.line}) - {status_validation}{category_str}"
-            else:
-                scenario_txt = f"scenario in {scenario.filename} at l.{scenario.line} - step ? (missing step implementation ?) - {status_validation}{category_str}"
+            scenario_txt = f"{ReportManager.format_context_period(scenario_context)} {ReportManager.format_scenario_short_description(scenario)} - {ReportManager.format_step_short_description(step_failed, step_number, step_context, dt_ref=scenario_context.start_datetime)} - {status_validation}{category_str}"
             if category not in self.__scenarios_by_category:
                 self.__scenarios_by_category[category] = []

holado_report/report/builders/summary_scenario_failed_report_builder.py CHANGED Viewed

@@ -13,6 +13,7 @@
 import logging
 from holado_report.report.builders.report_builder import ReportBuilder
+from holado_report.report.report_manager import ReportManager
 logger = logging.getLogger(__name__)
@@ -30,11 +31,10 @@ class SummaryScenarioFailedReportBuilder(ReportBuilder):
         pass
     def after_scenario(self, scenario, scenario_report=None):
-        from holado_report.report.report_manager import ReportManager
-        category_validation, status_validation, step_failed, step_number = ReportManager.get_current_scenario_status_information(scenario)
+        category_validation, status_validation, step_failed, step_number, scenario_context, step_context = ReportManager.get_current_scenario_status_information(scenario)
         if status_validation != "Passed":
-            self.__file_fail_add_scenario(scenario, category_validation, status_validation, step_failed, step_number)
+            self.__file_fail_add_scenario(scenario, category_validation, status_validation, step_failed, step_number, scenario_context, step_context)
     def after_all(self):
         # Manage file fail
@@ -42,13 +42,10 @@ class SummaryScenarioFailedReportBuilder(ReportBuilder):
             self.__file_fail.close()
             self.__file_fail = None
-    def __file_fail_add_scenario(self, scenario, category_validation, status_validation, step_failed, step_number):
+    def __file_fail_add_scenario(self, scenario, category_validation, status_validation, step_failed, step_number, scenario_context, step_context):
         self.__open_file_if_needed()
         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:
-            self.__file_fail.write(f"scenario in {scenario.filename} at l.{scenario.line} - step ? (missing step implementation ?) - {status_validation}{category_str}\n")
+        self.__file_fail.write(f"{ReportManager.format_context_period(scenario_context)} {ReportManager.format_scenario_short_description(scenario)} - {ReportManager.format_step_short_description(step_failed, step_number, step_context, dt_ref=scenario_context.start_datetime)} - {status_validation}{category_str}\n")
         self.__file_fail.flush()
     def __open_file_if_needed(self):

holado_report/report/builders/summary_scenario_report_builder.py CHANGED Viewed

@@ -13,8 +13,7 @@
 import logging
 from holado_report.report.builders.report_builder import ReportBuilder
-from holado_python.common.tools.datetime import DateTime,\
-    FORMAT_DATETIME_HUMAN_SECOND
+from holado_report.report.report_manager import ReportManager
 logger = logging.getLogger(__name__)
@@ -32,13 +31,12 @@ class SummaryScenarioReportBuilder(ReportBuilder):
         pass
     def after_scenario(self, scenario, scenario_report=None):
-        from holado_report.report.report_manager import ReportManager
-        category_validation, status_validation, step_failed, step_number = ReportManager.get_current_scenario_status_information(scenario)
+        category_validation, status_validation, step_failed, step_number, scenario_context, step_context = ReportManager.get_current_scenario_status_information(scenario)
         if status_validation == "Passed":
-            self.__file_add_scenario_success(scenario, category_validation, status_validation)
+            self.__file_add_scenario_success(scenario, category_validation, status_validation, scenario_context)
         else:
-            self.__file_add_scenario_fail(scenario, category_validation, status_validation, step_failed, step_number)
+            self.__file_add_scenario_fail(scenario, category_validation, status_validation, step_failed, step_number, scenario_context, step_context)
     def after_all(self):
         # Manage file fail
@@ -46,28 +44,24 @@ class SummaryScenarioReportBuilder(ReportBuilder):
             self.__file.close()
             self.__file = None
-    def __file_add_scenario_success(self, scenario, category_validation, status_validation):
+    def __file_add_scenario_success(self, scenario, category_validation, status_validation, scenario_context):
         self.__open_file_if_needed()
-        self.__file_write(scenario, None, category_validation, status_validation)
+        self.__file_write(scenario, None, category_validation, status_validation, scenario_context)
         self.__file.flush()
-    def __file_add_scenario_fail(self, scenario, category_validation, status_validation, step_failed, step_number):
+    def __file_add_scenario_fail(self, scenario, category_validation, status_validation, step_failed, step_number, scenario_context, step_context):
         self.__open_file_if_needed()
-        if step_failed is not None:
-            self.__file_write(scenario, f"step {step_number} (l.{step_failed.line})", category_validation, status_validation)
-        else:
-            self.__file_write(scenario, f"step ? (missing step implementation ?)", category_validation, status_validation)
+        self.__file_write(scenario, ReportManager.format_step_short_description(step_failed, step_number, step_context, dt_ref=scenario_context.start_datetime), category_validation, status_validation, scenario_context)
         self.__file.flush()
-    def __file_write(self, scenario, text, category_validation, status_validation):
-        dt = DateTime.now()
-        dt_str = DateTime.datetime_2_str(dt, FORMAT_DATETIME_HUMAN_SECOND)
+    def __file_write(self, scenario, text, category_validation, status_validation, scenario_context):
+        # Note: This report is currently used to extract scenarios statuses in CampaignManager.
+        #       Thus scenario period cannot be in compact format
         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")
+            self.__file.write(f"{ReportManager.format_context_period(scenario_context, use_compact_format=False)} {ReportManager.format_scenario_short_description(scenario)} - {text} - {status_validation}{category_str}\n")
         else:
-            self.__file.write(f"{dt_str} - {scenario.filename} at l.{scenario.line} - {status_validation}{category_str}\n")
+            self.__file.write(f"{ReportManager.format_context_period(scenario_context, use_compact_format=False)} {ReportManager.format_scenario_short_description(scenario)} - {status_validation}{category_str}\n")
     def __open_file_if_needed(self):
         if self.__file is None:

holado_report/report/execution_historic.py CHANGED Viewed

@@ -56,7 +56,8 @@ class ExecutionHistoric():
         self.__get_execution_historic_current_feature_scenarios().append(seh)
     def __new_ScenarioExecutionHistoric(self, scenario_context, scenario, scenario_report):
-        res = NamedTuple("ScenarioExecutionHistoric", scenario_context=object, scenario=object, scenario_report=object, steps_by_scope=dict, category_validation=str, status_validation=str, step_failed=object, step_failed_number=int)
+        res = NamedTuple("ScenarioExecutionHistoric", scenario_context=object, scenario=object, scenario_report=object, steps_by_scope=dict,
+                         category_validation=str, status_validation=str, step_failed=object, step_failed_number=int)
         res.scenario_context = scenario_context
         res.scenario = scenario
         res.scenario_report = scenario_report
@@ -88,7 +89,7 @@ class ExecutionHistoric():
     def after_scenario(self, scenario, scenario_report=None):
         from holado_report.report.report_manager import ReportManager
-        category_validation, status_validation, step_failed, step_number = ReportManager.get_current_scenario_status_information(scenario)
+        category_validation, status_validation, step_failed, step_number, _, _ = ReportManager.get_current_scenario_status_information(scenario)
         # Update execution historic
         current_scenario = self.__get_execution_historic_current_scenario()

holado_report/report/report_manager.py CHANGED Viewed

@@ -14,16 +14,15 @@
 from holado.common.context.session_context import SessionContext
 from holado_core.common.tools.tools import Tools
 import logging
-# from holado_report.report.builders.json_execution_historic_report_builder import JsonExecutionHistoricReportBuilder
-from holado_report.report.builders.detailed_scenario_failed_report_builder import DetailedScenarioFailedReportBuilder
-from holado_report.report.builders.summary_report_builder import SummaryReportBuilder
-from holado_report.report.builders.summary_scenario_failed_report_builder import SummaryScenarioFailedReportBuilder
-from holado_report.report.builders.short_scenario_failed_report_builder import ShortScenarioFailedReportBuilder
 from holado_report.report.reports.base_report import BaseReport
 from holado_scripting.common.tools.evaluate_parameters import EvaluateParameters
-from holado_report.report.builders.summary_scenario_report_builder import SummaryScenarioReportBuilder
-from holado_report.report.builders.failure_report_builder import FailureReportBuilder
-from holado_report.report.builders.summary_scenario_by_category_report_builder import SummaryScenarioByCategoryReportBuilder
+from holado_python.common.tools.datetime import DateTime,\
+    FORMAT_DATETIME_ISO_SECONDS, FORMAT_DATETIME_ISO, DurationUnit,\
+    FORMAT_TIME_ISO, FORMAT_TIME_ISO_SECONDS
+from holado_python.common.enums import ArithmeticOperator
+from holado.common.handlers.undefined import default_value
+from holado.holado_config import Config
+import copy
 # from holado_core.scenario.scenario_duration_manager import ScenarioDurationManager
 logger = logging.getLogger(__name__)
@@ -58,6 +57,15 @@ class ReportManager(BaseReport):
         self.__multitask_manager = multitask_manager
     def initialize_reports(self):
+        from holado_report.report.builders.detailed_scenario_failed_report_builder import DetailedScenarioFailedReportBuilder
+        from holado_report.report.builders.summary_report_builder import SummaryReportBuilder
+        from holado_report.report.builders.summary_scenario_failed_report_builder import SummaryScenarioFailedReportBuilder
+        from holado_report.report.builders.short_scenario_failed_report_builder import ShortScenarioFailedReportBuilder
+        from holado_report.report.builders.summary_scenario_report_builder import SummaryScenarioReportBuilder
+        from holado_report.report.builders.failure_report_builder import FailureReportBuilder
+        from holado_report.report.builders.summary_scenario_by_category_report_builder import SummaryScenarioByCategoryReportBuilder
+        from holado_report.report.builders.summary_by_category_report_builder import SummaryByCategoryReportBuilder
         # self.set_execution_historic()
         if self.has_report_path:
@@ -86,6 +94,9 @@ class ReportManager(BaseReport):
             fn = self.get_path("report_summary.txt")
             self.add_report_builder(SummaryReportBuilder(fn))
+            fn = self.get_path("report_summary_by_category.txt")
+            self.add_report_builder(SummaryByCategoryReportBuilder(fn))
     @property
     def __feature_reports(self):
         return self.children_reports("feature")
@@ -289,7 +300,9 @@ class ReportManager(BaseReport):
                 logger.debug(f"Category of scenario '{scenario}': {category}  (computed from last statuses: {statuses})")
-            cls._scenario_status_information_by_uid[scenario_uid] = [category, status, step_failed, step_nb]
+            cls._scenario_status_information_by_uid[scenario_uid] = [category, status, step_failed, step_nb,
+                                                                     SessionContext.instance().get_scenario_context(),
+                                                                     SessionContext.instance().get_scenario_context().get_step(step_nb-1) if step_nb is not None else None]
         return cls._scenario_status_information_by_uid[scenario_uid]
@@ -339,4 +352,64 @@ class ReportManager(BaseReport):
                 return cls.get_step_error_message(step)
         return None
+    @classmethod
+    def format_context_period(cls, context, format_precision_nsec=None, dt_ref=None, use_compact_format=default_value):
+        # Truncate datetimes with precision
+        dt_start, dt_end = context.start_datetime, context.end_datetime
+        if format_precision_nsec is not None:
+            dt_start = DateTime.truncate_datetime(dt_start, precision_nanoseconds=format_precision_nsec)
+            dt_end = DateTime.truncate_datetime(dt_end, precision_nanoseconds=format_precision_nsec)
+        # Define formats
+        dt_format_start = cls._get_datetime_format_compared_to_reference(dt_start, dt_ref, use_compact_format=use_compact_format)
+        dt_format_end = cls._get_datetime_format_compared_to_reference(dt_end, dt_start, use_compact_format=use_compact_format)
+        if len(dt_format_end) > len(dt_format_start):
+            dt_format_start = dt_format_end
+        # Format datetimes
+        start_txt = DateTime.datetime_2_str(dt_start, dt_format=dt_format_start)
+        end_txt = DateTime.datetime_2_str(dt_end, dt_format=dt_format_end)
+        # Truncate formatted datetimes if needed
+        if format_precision_nsec is not None:
+            trunc_len = len(f'{int(format_precision_nsec)}') - 4
+            if trunc_len > 0:
+                start_txt = start_txt[:-trunc_len-1]+'Z' if start_txt.endswith('Z') else start_txt[:-trunc_len]
+                end_txt = end_txt[:-trunc_len-1]+'Z' if end_txt.endswith('Z') else end_txt[:-trunc_len]
+        return f"[{start_txt} - {end_txt}]"
+    @classmethod
+    def _get_datetime_format_compared_to_reference(cls, dt, dt_ref=None, use_compact_format=default_value):
+        if use_compact_format is default_value:
+            use_compact_format = Config.report_compact_datetime_period  # @UndefinedVariable
+        if dt_ref is None:
+            return FORMAT_DATETIME_ISO
+        if not use_compact_format or dt.date() != dt_ref.date():
+            return FORMAT_DATETIME_ISO
+        elif dt.hour != dt_ref.hour:
+            return FORMAT_TIME_ISO
+        elif dt.minute != dt_ref.minute:
+            return '%M:%S.%f'
+        elif dt.second != dt_ref.second:
+            return '%S.%f'
+        else:
+            return '.%f'
+    @classmethod
+    def format_scenario_short_description(cls, scenario):
+        return f"{scenario.filename} at l.{scenario.line}"
+    @classmethod
+    def format_step_short_description(cls, step, step_number, step_context=None, dt_ref=None):
+        if step:
+            if step_context:
+                return f"step {step_number} (l.{step.line} on {cls.format_context_period(step_context, dt_ref=dt_ref)})"
+            else:
+                return f"step {step_number} (l.{step.line})"
+        else:
+            return "step ? (missing step implementation ?)"

holado_test/tools/test_server/client/rest/test_server_client.py CHANGED Viewed

@@ -21,6 +21,7 @@ from holado.common.handlers.undefined import undefined_argument, undefined_value
 import os
 from holado_core.common.tools.converters.converter import Converter
 from holado_core.common.exceptions.technical_exception import TechnicalException
+from holado_core.common.handlers.wait import WaitFuncResult
 logger = logging.getLogger(__name__)
@@ -72,6 +73,8 @@ class TestServerClient(RestClient):
             logger.info(f"Test server is {'not ' if not self.__is_available else ''}available")
         return self.__is_available
+    # Monitoring
     def ping(self):
         url_parsed = urllib.parse.urlparse(self.url)
         netloc_pattern = r"(?P<host>.*?)(?::(?P<port>\d+))?$"
@@ -98,6 +101,23 @@ class TestServerClient(RestClient):
             logger.debug(f"Ping of test server succeeded for ({host}, {port})")
             return True
+    def is_healthy(self):
+        try:
+            response = self.get(f"health")
+            return response.status_code == 200
+        except:
+            return False
+    def wait_is_healthy(self, timeout_sec=300, do_raise_on_timeout=True):
+        logger.info("Waiting for test-server to be healthy...")
+        wait_context = WaitFuncResult(f"wait test-server is healthy", self.is_healthy)
+        wait_context.with_timeout(timeout_sec) \
+                    .with_raise_on_timeout(do_raise_on_timeout) \
+                    .with_process_in_thread(False)
+        wait_context.redo_until(True)
+        wait_context.execute()
+        logger.info("test-server is healthy")
     # Manage campaigns actions

holado_test/tools/test_server/server/rest/api/__init__.py CHANGED Viewed

@@ -11,13 +11,14 @@
 #################################################
 from flask.views import MethodView
-from holado.common.context.session_context import SessionContext
-import logging
+# import logging
-logger = logging.getLogger(__name__)
+# logger = logging.getLogger(__name__)
+class HealthView(MethodView):
+    def get(self):
+        return {'status': 'healthy'}
-def _get_session_context():
-    return SessionContext.instance()

holado_test/tools/test_server/server/rest/openapi.yaml CHANGED Viewed

@@ -5,6 +5,17 @@ info:
   description: |
     API exposed by Test Server.
 paths:
+  /health:
+    get:
+      description: "Healthcheck"
+      responses:
+        200:
+          description: "Healthy"
+          content:
+            application/json:
+              schema:
+                type: "string"
   /campaign/update:
     put:
       description: "Update stored campaigns"

holado_tools/tools/host_controller/client/rest/host_controller_client.py CHANGED Viewed

@@ -18,6 +18,7 @@ from holado.common.handlers.undefined import default_value, undefined_argument,\
 import os
 from holado_core.common.tools.converters.converter import Converter
 from holado_rest.api.rest.rest_manager import RestManager
+from holado_core.common.handlers.wait import WaitFuncResult
 logger = logging.getLogger(__name__)
@@ -63,6 +64,27 @@ class HostControllerClient(RestClient):
     def __init__(self, name, url, headers=None):
         super().__init__(name, url, headers)
+    # Monitoring
+    def is_healthy(self):
+        try:
+            response = self.get(f"health")
+            return response.status_code == 200
+        except:
+            return False
+    def wait_is_healthy(self, timeout_sec=300, do_raise_on_timeout=True):
+        logger.info("Waiting for host-controller to be healthy...")
+        wait_context = WaitFuncResult(f"wait test-server is healthy", self.is_healthy)
+        wait_context.with_timeout(timeout_sec) \
+                    .with_raise_on_timeout(do_raise_on_timeout) \
+                    .with_process_in_thread(False)
+        wait_context.redo_until(True)
+        wait_context.execute()
+        logger.info("host-controller is healthy")
     # Common features
     def get_environment_variable_value(self, var_name):

holado_tools/tools/host_controller/server/rest/api/__init__.py CHANGED Viewed

@@ -10,15 +10,15 @@
 # The Software is provided “as is”, without warranty of any kind, express or implied, including but not limited to the warranties of merchantability, fitness for a particular purpose and noninfringement. In no event shall the authors or copyright holders be liable for any claim, damages or other liability, whether in an action of contract, tort or otherwise, arising from, out of or in connection with the software or the use or other dealings in the Software.
 #################################################
-# from flask.views import MethodView
-# from holado.common.context.session_context import SessionContext
+from flask.views import MethodView
 # import logging
-#
 # logger = logging.getLogger(__name__)
-#
-#
-#
-# def _get_session_context():
-#     return SessionContext.instance()
+class HealthView(MethodView):
+    def get(self):
+        return {'status': 'healthy'}

holado_tools/tools/host_controller/server/rest/openapi.yaml CHANGED Viewed

@@ -9,6 +9,17 @@ info:
     For example, it is usefull for a testing solution needing to restart a microservice of the SUT (System Under Test),
     but the testing solution docker image has not the privileges to do it.
 paths:
+  /health:
+    get:
+      description: "Healthcheck"
+      responses:
+        200:
+          description: "Healthy"
+          content:
+            application/json:
+              schema:
+                type: "string"
   /os/env:
     get:
       description: "Get environment variable values"

holado_tools/tools/host_viewer/server/rest/api/__init__.py CHANGED Viewed

@@ -10,13 +10,15 @@
 # The Software is provided “as is”, without warranty of any kind, express or implied, including but not limited to the warranties of merchantability, fitness for a particular purpose and noninfringement. In no event shall the authors or copyright holders be liable for any claim, damages or other liability, whether in an action of contract, tort or otherwise, arising from, out of or in connection with the software or the use or other dealings in the Software.
 #################################################
-# from flask.views import MethodView
-# from holado.common.context.session_context import SessionContext
+from flask.views import MethodView
 # import logging
-#
 # logger = logging.getLogger(__name__)
-#
-#
-# def _get_session_context():
-#     return SessionContext.instance()
+class HealthView(MethodView):
+    def get(self):
+        return {'status': 'healthy'}

holado_tools/tools/host_viewer/server/rest/openapi.yaml CHANGED Viewed

@@ -8,6 +8,17 @@ info:
     whereas all other microservices have user privileges.
     For example, it is usefull to monitor containers statuses from any terminal on the network.
 paths:
+  /health:
+    get:
+      description: "Healthcheck"
+      responses:
+        200:
+          description: "Healthy"
+          content:
+            application/json:
+              schema:
+                type: "string"
   /os/env:
     get:
       description: "Get environment variable values"

test_holado/environment.py CHANGED Viewed

@@ -44,3 +44,10 @@ from holado_test.behave.behave_environment import *  # @UnusedWildImport
 # Define project specific environment methods
+# Wait test daemons are healthy
+from holado_core.common.tools.converters.converter import Converter
+do_wait_test_server = Converter.to_boolean(os.getenv("HOLADO_WAIT_TEST_SERVER", True))
+if do_wait_test_server:
+    SessionContext.instance().test_server_client.wait_is_healthy()

{holado-0.11.3.dist-info → holado-0.11.5.dist-info}/WHEEL RENAMED Viewed

File without changes

{holado-0.11.3.dist-info → holado-0.11.5.dist-info}/licenses/LICENSE RENAMED Viewed

File without changes

holado 0.11.3__py3-none-any.whl → 0.11.5__py3-none-any.whl

Potentially problematic release.

holado 0.11.3py3-none-any.whl → 0.11.5py3-none-any.whl