holado 0.9.0__tar.gz → 0.9.1__tar.gz

{holado-0.9.0 → holado-0.9.1}/PKG-INFO

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

holado-0.9.1/packaging/VERSION

@@ -0,0 +1 @@
+0.9.1

{holado-0.9.0 → holado-0.9.1}/src/holado/common/context/session_context.py

@@ -12,13 +12,13 @@
 #################################################
 
 from builtins import super
-from _datetime import datetime
 import logging
 import os.path
 from holado.common.context.context import Context
 from holado_core.common.tools.tools import Tools
 import threading
 from holado.common.handlers.enums import ObjectStates
+from holado_python.common.tools.datetime import DateTime
 
 
 logger = logging
@@ -151,7 +151,7 @@ class SessionContext(Context):
         report_path = None
         if self.with_session_path:
             # Create new report path for this session
-            name = "session_{}".format(datetime.now().strftime("%Y-%m-%d_%H-%M-%S"))
+            name = "session_{}".format(DateTime.now().strftime("%Y-%m-%d_%H-%M-%S"))
             report_path = self.path_manager.get_reports_path(name)
             logger.info(f"Reports location: {report_path}")
             print(f"Reports location: {report_path}")
@@ -331,13 +331,14 @@ class SessionContext(Context):
         
         with self.__multitask_lock:
             # Log error on failing scenario
-            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)
             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}:  [scenario in {scenario.filename} at l.{scenario.line} - step {step_number} (l.{step_failed.line})]")
+                    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}:  [scenario in {scenario.filename} at l.{scenario.line} - step ? (missing step implementation ?)]")
+                    msg_list.append(f"Scenario {status_validation}{category_str}:  [scenario in {scenario.filename} at l.{scenario.line} - step ? (missing step implementation ?)]")
                 step_error_message = ReportManager.get_step_error_message(step_failed)
                 if step_error_message:
                     msg_list.append(step_error_message)

{holado-0.9.0 → holado-0.9.1}/src/holado_core/common/block/base.py

@@ -13,9 +13,9 @@
 
 from builtins import super
 import abc
-from datetime import datetime
 import logging
 from holado_core.common.tools.tools import Tools
+from holado_python.common.tools.datetime import DateTime
 
 logger = logging.getLogger(__name__)
 
@@ -66,10 +66,10 @@ class BaseBlock(object):
         raise NotImplementedError
 
     def _process_start(self):
-        self.__start_dt = datetime.now()
+        self.__start_dt = DateTime.now()
 
     def _process_end(self):
-        self.__end_dt = datetime.now()
+        self.__end_dt = DateTime.now()
     
 
 

{holado-0.9.0 → holado-0.9.1}/src/holado_core/common/tools/path_manager.py

@@ -189,7 +189,7 @@ class PathManager(object):
     def get_timestamped_path(self, prefix, ext, dt=None, dt_format="%Y%m%d-%H%M%S"):
         ext = ext.strip('.')
         if dt is None:
-            dt = datetime.now()
+            dt = DateTime.now()
         now_str = datetime.strftime(dt, dt_format)
         return f"{prefix}_{now_str}.{ext}"
     

{holado-0.9.0 → holado-0.9.1}/src/holado_django/server/django_projects/rest_api/rest_api/urls.py

@@ -18,7 +18,7 @@ from django.contrib import admin
 from django.urls import path
 from rest_framework import routers
 from django.urls.conf import include
-from rest_api.application.apps import django_application_inst
+from rest_api.application.apps import django_application_inst  # @UnresolvedImport
 from holado_core.common.exceptions.technical_exception import TechnicalException
 
 router = routers.DefaultRouter()

{holado-0.9.0 → holado-0.9.1}/src/holado_docker/tests/behave/steps/tools/docker_controller/client_steps.py

@@ -19,7 +19,7 @@ import logging
 from holado_test.scenario.step_tools import StepTools
 from holado_test.behave.scenario.behave_step_tools import BehaveStepTools
 from holado_value.common.tables.converters.value_table_converter import ValueTableConverter
-from holado_docker.tools.docker_controller.docker_controller_manager import DockerControllerManager
+from holado_docker.tools.docker_controller.client.rest.docker_controller_client import DockerControllerClient
 
 logger = logging.getLogger(__name__)
 
@@ -40,7 +40,7 @@ def step_impl(context, var_name):
     else:
         kwargs = {}
     
-    res = DockerControllerManager.new_client(**kwargs)
+    res = DockerControllerClient.new_client(**kwargs)
 
     __get_variable_manager().register_variable(var_name, res)
 

{holado-0.9.0 → holado-0.9.1}/src/holado_docker/tools/docker_controller/client/rest/docker_controller_client.py

@@ -13,13 +13,50 @@
 
 import logging
 from holado_rest.api.rest.rest_client import RestClient
-from holado.common.handlers.undefined import default_value
+from holado.common.handlers.undefined import default_value, undefined_argument,\
+    undefined_value
+import os
+from holado_core.common.tools.converters.converter import Converter
+from holado_rest.api.rest.rest_manager import RestManager
 
 logger = logging.getLogger(__name__)
 
 
 class DockerControllerClient(RestClient):
     
+    @classmethod
+    def new_client(cls, use_localhost=undefined_argument, **kwargs):
+        if 'name' not in kwargs:
+            kwargs['name'] = None
+        if 'url' not in kwargs:
+            if use_localhost is undefined_argument:
+                env_use = os.getenv("HOLADO_USE_LOCALHOST", False)
+                use_localhost = Converter.is_boolean(env_use) and Converter.to_boolean(env_use)
+            
+            url = os.getenv("HOLADO_DOCKER_CONTROLLER_URL", undefined_value)
+            if url is undefined_value:
+                scheme = kwargs.get('scheme', undefined_value)
+                if scheme is undefined_value:
+                    scheme = os.getenv("HOLADO_DOCKER_CONTROLLER_SCHEME", "http")
+                host = kwargs.get('host', undefined_value)
+                if host is undefined_value:
+                    host = "localhost" if use_localhost else os.getenv("HOLADO_DOCKER_CONTROLLER_HOST", "holado_docker_controller")
+                port = kwargs.get('port', undefined_value)
+                if port is undefined_value:
+                    port = os.getenv("HOLADO_DOCKER_CONTROLLER_PORT", 51231)
+                
+                if port is None:
+                    url = f"{scheme}://{host}"
+                else:
+                    url = f"{scheme}://{host}:{port}"
+            kwargs['url'] = url
+        
+        manager = RestManager(default_client_class=DockerControllerClient)
+        res = manager.new_client(**kwargs)
+        
+        return res
+
+    
     def __init__(self, name, url, headers=None):
         super().__init__(name, url, headers)
     

{holado-0.9.0 → holado-0.9.1}/src/holado_docker/tools/docker_controller/server/run_docker_controller_in_docker.sh

@@ -12,8 +12,8 @@
 #     Have access to any HolAdo registry.
 #
 #     Optionally, define in .profile the following variables
-#         - HOLADO_DOCKER_CONTROLLER_NAME: name of the container
-#         - HOLADO_DOCKER_CONTROLLER_PORT: REST API port to use (default: 8000)
+#         - HOLADO_DOCKER_CONTROLLER_HOST: host name or name of the container
+#         - HOLADO_DOCKER_CONTROLLER_PORT: REST API port to use (default: 51231)
 #         - HOLADO_IMAGE_REGISTRY: docker image registry to use (default: holado/docker_controller)
 #         - HOLADO_IMAGE_TAG: docker image tag to use (default: latest)
 #         - HOLADO_OUTPUT_BASEDIR: absolute path to base output directory (default: [HOME]/.holado/output)
@@ -75,7 +75,7 @@ fi
 
 # Define port to use
 if [[ -z "$HOLADO_DOCKER_CONTROLLER_PORT" ]]; then
-    HOLADO_DOCKER_CONTROLLER_PORT=8000
+    HOLADO_DOCKER_CONTROLLER_PORT=51231
 fi
 
 

{holado-0.9.0 → holado-0.9.1}/src/holado_examples/tests/behave/testing_solution/environment.py

@@ -12,13 +12,13 @@ source_path = os.path.normpath(os.path.join(here, 'src'))
 sys.path.insert(0, source_path)
 
 # Add HolAdo source paths (needed when using a clone of HolAdo project)
-from initialize_holado import insert_holado_source_paths
+from initialize_holado import insert_holado_source_paths  # @UnresolvedImport
 insert_holado_source_paths()
 
 
 # Configure HolAdo
 import holado
-from context.session_context import TSSessionContext
+from context.session_context import TSSessionContext  # @UnresolvedImport
 # holado.initialize(TSessionContext=TSSessionContext, 
 holado.initialize(TSessionContext=None, 
                   logging_config_file_path=os.path.join(here, 'logging.conf'), log_level=logging.INFO,
@@ -26,7 +26,7 @@ holado.initialize(TSessionContext=None,
 
 
 # Import generic environment methods
-from behave_environment import *
+from behave_environment import *  # @UnresolvedImport
 
 # Define project specific environment methods
 # TestConfig.profile_memory_in_features = True

{holado-0.9.0 → holado-0.9.1}/src/holado_examples/tests/behave/testing_solution/src/context/session_context.py

@@ -17,7 +17,7 @@ class TSSessionContext(SessionContext):
         
         # Override default registered modules
          
-        from common.tools.path_manager import TSPathManager
+        from common.tools.path_manager import TSPathManager  # @UnresolvedImport
         self.services.register_service_type("path_manager", TSPathManager,
                             lambda m: m.initialize(),
                             raise_if_exist=False )
@@ -25,7 +25,7 @@ class TSSessionContext(SessionContext):
         
         # Register new modules
         
-        from config.config_manager import TSConfigManager
+        from config.config_manager import TSConfigManager  # @UnresolvedImport
         self.services.register_service_type("config_manager", TSConfigManager,
                             lambda m: m.initialize(lambda: self.path_manager) )
         

{holado-0.9.0 → holado-0.9.1}/src/holado_examples/tests/behave/testing_solution/steps/config_steps.py

@@ -3,7 +3,7 @@
 import logging
 from holado_test.behave.behave import *  # @UnusedWildImport
 from holado.common.context.session_context import SessionContext
-from config.config_manager import TSConfigManager
+from config.config_manager import TSConfigManager  # @UnresolvedImport
 
 
 logger = logging.getLogger(__name__)

{holado-0.9.0 → holado-0.9.1}/src/holado_multitask/multithreading/loopthread.py

@@ -13,10 +13,10 @@
 
 import threading
 import time
-import datetime
 import logging
 import holado_multitask.multithreading.thread as ctt
 from holado.common.handlers.undefined import default_context
+from holado_python.common.tools.datetime import DateTime
 
 logger = logging.getLogger(__name__)
 
@@ -31,7 +31,7 @@ class LoopThread(ctt.InterruptableThread):
         
         # Manage loops
         self.__is_under_loop = threading.Event()
-        self.__next_loop_datetime = datetime.datetime.now()
+        self.__next_loop_datetime = DateTime.now()
         self.__loop_counter = 0
         
     @property
@@ -79,10 +79,10 @@ class LoopThread(ctt.InterruptableThread):
         logger.info("Loop thread '{}' has finished.".format(self.name))
         
     def does_need_run_loop(self):
-        return datetime.datetime.now() >= self.__next_loop_datetime
+        return DateTime.now() >= self.__next_loop_datetime
     
     def _get_sleep_time_before_next_loop(self):
-        now = datetime.datetime.now()
+        now = DateTime.now()
         if now < self.__next_loop_datetime:
             delta = self.__next_loop_datetime - now
             res = delta.total_seconds()

{holado-0.9.0 → holado-0.9.1}/src/holado_python/common/tools/datetime.py

@@ -22,7 +22,7 @@ import os
 from holado_core.common.tools.converters.converter import Converter
 from enum import Enum
 from holado_python.common.enums import ArithmeticOperator
-from datetime import timedelta, timezone
+from datetime import timedelta
 from dateutil.relativedelta import relativedelta
 import math
 from decimal import Decimal
@@ -39,6 +39,9 @@ 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'
 
+TIMEZONE_LOCAL = datetime.datetime.now().astimezone().tzinfo
+TIMEZONE_UTC = datetime.timezone.utc
+
 
 class DurationUnit(str, Enum):
     # Nanosecond = "nanosecond"
@@ -55,11 +58,16 @@ class DurationUnit(str, Enum):
 
 
 class DateTime(object):
+    """ Tools to manipulate datetimes.
+    Note: Naive and aware datetimes cannot be compared. Thus HolAdo methods always set datetime timezone when it is known.
+          In methods unable to define the timezone (ex: str_2_datetime), it is highly recommended to specify 'tz' argument.
+    """
     
     __is_system_time_in_tai = None
     __is_system_time_expected_in_tai = None
     __utc_to_tai_timedelta = None
     
+    
     def __init__(self):
         pass
     
@@ -71,22 +79,22 @@ class DateTime(object):
         return cls.__is_system_time_in_tai
     
     @classmethod
-    def now(cls):
-        return datetime.datetime.now()
+    def now(cls, tz=TIMEZONE_LOCAL):
+        return datetime.datetime.now(tz=tz)
     
     @classmethod
     def utcnow(cls):
         if cls.is_system_time_in_tai():
-            return datetime.datetime.utcnow() - cls.utc_to_tai_timedelta()
+            return cls.now(TIMEZONE_UTC) - cls.utc_to_tai_timedelta()
         else:
-            return datetime.datetime.utcnow()
+            return cls.now(TIMEZONE_UTC)
     
     @classmethod
     def tainow(cls):
         if cls.is_system_time_in_tai():
-            return datetime.datetime.utcnow()
+            return cls.now(TIMEZONE_UTC)
         else:
-            return datetime.datetime.utcnow() + cls.utc_to_tai_timedelta()
+            return cls.now(TIMEZONE_UTC) + cls.utc_to_tai_timedelta()
     
     @classmethod
     def utc_to_tai_timedelta(cls):
@@ -126,8 +134,15 @@ class DateTime(object):
         return res
 
     @classmethod
-    def str_2_datetime(cls, dt_str, dt_format=None, default_timezone=timezone.utc):
-        """Convert string to datetime instance"""
+    def str_2_datetime(cls, dt_str, dt_format=None, tz=None):
+        """Convert string to datetime instance
+        @param dt_format If defined, use this format to parse string rather than using first matching format
+        @param tz If defined, return a datetime with this timezone. 
+                  If string already defines a timezone, the datetime is converted to this timezone, 
+                  else the string is supposed to represent a datetime in this timezone and timezone is set in result datetime.
+        Note: Naive and aware datetimes cannot be compared. Thus HolAdo methods always set datetime timezone when it is known.
+              It is highly recommended to specify 'tz' argument
+        """
         res = None
         if dt_format is None:
             res = dateutil.parser.parse(dt_str)
@@ -135,8 +150,11 @@ class DateTime(object):
             res = datetime.datetime.strptime(dt_str, dt_format)
         
         # Set timezone if needed
-        if res.tzinfo is None and default_timezone is not None:
-            res = res.replace(tzinfo=default_timezone)
+        if tz is not None:
+            if res.tzinfo is None:
+                res = res.replace(tzinfo=tz)
+            else:
+                res = res.astimezone(tz)
         
         return res
 
@@ -162,19 +180,19 @@ class DateTime(object):
         return res
     
     @classmethod
-    def _get_datetime(cls, dt):
+    def _get_datetime(cls, dt, tz_in_str=None):
         res = None
         if dt is not None:
             if isinstance(dt, datetime.datetime):
                 res = dt
             elif isinstance(dt, str):
-                res = DateTime.str_2_datetime(dt)
+                res = DateTime.str_2_datetime(dt, tz=tz_in_str)
             else:
                 raise TechnicalException(f"Datetime can be a datetime, a str containing a datetime, or None")
         return res
     
     @classmethod
-    def _get_epoch_datetime(cls, epoch):
+    def _get_epoch_datetime(cls, epoch, tz_in_str=None):
         res = None
         if epoch is not None:
             if isinstance(epoch, datetime.datetime):
@@ -183,7 +201,7 @@ class DateTime(object):
                 if epoch in ['EPOCH_1970', 'EPOCH_JULIAN_CNES', 'EPOCH_JULIAN_NASA']:
                     res = eval(epoch)
                 else:
-                    res = DateTime.str_2_datetime(epoch)
+                    res = DateTime.str_2_datetime(epoch, tz=tz_in_str)
             else:
                 raise TechnicalException(f"Epoch can be a datetime, a str containing a datetime, a str containing an EPOCH name, or None")
         return res
@@ -296,7 +314,7 @@ class DateTime(object):
         """
         dt_src = dt
         if isinstance(dt_src, str):
-            dt_src = cls.str_2_datetime(dt_src, dt_format)
+            dt_src = cls.str_2_datetime(dt_src, dt_format, tz=TIMEZONE_UTC)
         
         return dt_src + DateTime.utc_to_tai_timedelta()
     
@@ -308,7 +326,7 @@ class DateTime(object):
         """
         dt_src = dt
         if isinstance(dt_src, str):
-            dt_src = cls.str_2_datetime(dt_src, dt_format)
+            dt_src = cls.str_2_datetime(dt_src, dt_format, tz=TIMEZONE_UTC)
         
         return dt_src - DateTime.utc_to_tai_timedelta()
         

holado-0.9.1/src/holado_python/standard_library/ssl/resources/certificates/tcpbin.crt

@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+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
+-----END CERTIFICATE-----

holado-0.9.1/src/holado_python/standard_library/ssl/resources/certificates/tcpbin.key

@@ -0,0 +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
+-----END PRIVATE KEY-----

{holado-0.9.0 → holado-0.9.1}/src/holado_python/tests/behave/steps/standard_library/datetime_steps.py

@@ -45,9 +45,9 @@ def step_impl(context, varname, format_value, duration, duration_unit, value):
     deltaT = timedelta(**args)
      
     if value == "ago": 
-        date = datetime.now() - deltaT
+        date = DateTime.now() - deltaT
     elif value == "ahead":
-        date = datetime.now() + deltaT
+        date = DateTime.now() + deltaT
         
     
     v = date.strftime(format_value)

{holado-0.9.0 → holado-0.9.1}/src/holado_rabbitmq/tools/rabbitmq/rabbitmq_manager.py

@@ -92,12 +92,12 @@ class RMQManager:
         #         polling_seconds = 0.001       # a polling period below 1 ms is usually not efficient in testing context
         #
         # # Wait first message is needed
-        # dt_begin = datetime.now()
+        # dt_begin = DateTime.now()
         # dt_last_poll = dt_begin
         # if first_timeout_seconds is not None:
         #     while (dt_last_poll - dt_begin).total_seconds() < first_timeout_seconds:
         #         nb_msg_by_consumer = {c.name: c.nb_messages for c in consumers if c.nb_messages > 0}
-        #         dt_last_poll = datetime.now()
+        #         dt_last_poll = DateTime.now()
         #         if len(nb_msg_by_consumer) > 0:
         #             res = sum(nb_msg_by_consumer.values())
         #             if Tools.do_log(logger, logging.DEBUG):
@@ -115,7 +115,7 @@ class RMQManager:
         # while (dt_last_poll - dt_last_receive).total_seconds() < window_seconds:
         #     nb_msg_by_consumer = {c.name: c.nb_messages for c in consumers if c.nb_messages > 0}
         #     nb = sum(nb_msg_by_consumer.values())
-        #     dt_last_poll = datetime.now()
+        #     dt_last_poll = DateTime.now()
         #     if nb > res:
         #         res = nb
         #         if Tools.do_log(logger, logging.DEBUG):

{holado-0.9.0 → holado-0.9.1}/src/holado_report/campaign/campaign_manager.py

@@ -14,9 +14,10 @@
 from holado.common.context.session_context import SessionContext
 import logging
 from holado_core.common.resource.table_data_manager import TableDataManager
-from holado_python.common.tools.datetime import DateTime
+from holado_python.common.tools.datetime import DateTime, TIMEZONE_LOCAL
 import os
 from holado_system.system.filesystem.file import File
+import re
 
 
 logger = logging.getLogger(__name__)
@@ -99,7 +100,7 @@ class CampaignManager(object):
         res_dict_list = client.execute(query_str, result_as_dict_list=True, as_generator=False)
         
         status_dt_str = res_dict_list[0]['status_at'] if res_dict_list else None
-        status_dt = DateTime.str_2_datetime(status_dt_str) if status_dt_str else None
+        status_dt = DateTime.str_2_datetime(status_dt_str, tz=TIMEZONE_LOCAL) if status_dt_str else None
         return status_dt
         
     def import_campaign_reports(self, report_path):
@@ -182,7 +183,11 @@ class CampaignManager(object):
             parts = line.split(' - ')
             status_dt_str = parts[0]
             scenario_name = parts[1]
-            status = parts[-1]
+            status_info = parts[-1]
+            
+            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-0.9.0 → holado-0.9.1}/src/holado_report/report/builders/detailed_scenario_failed_report_builder.py

@@ -33,10 +33,10 @@ class DetailedScenarioFailedReportBuilder(ReportBuilder):
         
     def after_scenario(self, scenario, scenario_report=None):
         from holado_report.report.report_manager import ReportManager
-        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)
         
         if status_validation != "Passed":
-            self.__file_fail_add_scenario(scenario, scenario_report, status_validation, step_failed, step_number)
+            self.__file_fail_add_scenario(scenario, scenario_report, category_validation, status_validation, step_failed, step_number)
             
     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, status_validation, step_failed, step_number):
+    def __file_fail_add_scenario(self, scenario, scenario_report, category_validation, status_validation, step_failed, step_number):
         if self.__is_format_xml:
-            self.__file_fail_add_scenario_xml(scenario, scenario_report, status_validation, step_failed, step_number)
+            self.__file_fail_add_scenario_xml(scenario, scenario_report, category_validation, status_validation, step_failed, step_number)
         else:
-            self.__file_fail_add_scenario_txt(scenario, scenario_report, status_validation, step_failed, step_number)
+            self.__file_fail_add_scenario_txt(scenario, scenario_report, category_validation, status_validation, step_failed, step_number)
         
-    def __file_fail_add_scenario_xml(self, scenario, scenario_report, status_validation, step_failed, step_number):
+    def __file_fail_add_scenario_xml(self, scenario, scenario_report, category_validation, status_validation, step_failed, step_number):
         from holado_report.report.report_manager import ReportManager
         
         self.__open_file_if_needed()
@@ -61,6 +61,8 @@ class DetailedScenarioFailedReportBuilder(ReportBuilder):
         msg_list.append(f"    <scenario>{scenario.name}</scenario>")
         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:
+            msg_list.append(f"    <validation_category>{category_validation}</validation_category>")
         msg_list.append(f"    <validation_status>{status_validation}</validation_status>")
         if step_failed is not None:
             msg_list.append(f"    <failure>")
@@ -102,7 +104,7 @@ class DetailedScenarioFailedReportBuilder(ReportBuilder):
         self.__file_fail.write(msg)
         self.__file_fail.flush()
         
-    def __file_fail_add_scenario_txt(self, scenario, scenario_report, status_validation, step_failed, step_number):
+    def __file_fail_add_scenario_txt(self, scenario, scenario_report, category_validation, status_validation, step_failed, step_number):
         from holado_report.report.report_manager import ReportManager
         
         self.__open_file_if_needed()
@@ -112,6 +114,8 @@ class DetailedScenarioFailedReportBuilder(ReportBuilder):
         msg_list.append(f"    Scenario: {scenario.name}")
         msg_list.append(f"    Report: {scenario_report.report_path}")
         msg_list.append(f"    Tags: -t " + " -t ".join(scenario.feature.tags + scenario.tags))
+        if category_validation:
+            msg_list.append(f"    Validation category: {category_validation}")
         msg_list.append(f"    Validation status: {status_validation}")
         if step_failed is not None:
             msg_list.append(f"    Failure:")

{holado-0.9.0 → holado-0.9.1}/src/holado_report/report/builders/failure_report_builder.py

@@ -41,16 +41,17 @@ class FailureReportBuilder(ReportBuilder):
         
     def after_scenario(self, scenario, scenario_report=None):
         from holado_report.report.report_manager import ReportManager
-        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)
         
         if status_validation != "Passed":
             step_error_message = ReportManager.get_step_error_message(step_failed).strip()
             if step_error_message not in self.__failures:
                 self.__failures[step_error_message] = []
             
+            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}")
+                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"    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))
@@ -59,7 +60,7 @@ class FailureReportBuilder(ReportBuilder):
                 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}",
+                    'title': f"{scenario.filename} - l.{scenario.line} - step {step_number} (l.{step_failed.line}) - {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),