holado 0.9.0__py3-none-any.whl → 0.9.1__py3-none-any.whl

holado_report/report/report_manager.py

@@ -12,7 +12,6 @@
 #################################################
 
 from holado.common.context.session_context import SessionContext
-from behave.model_core import Status
 from holado_core.common.tools.tools import Tools
 import logging
 # from holado_report.report.builders.json_execution_historic_report_builder import JsonExecutionHistoricReportBuilder
@@ -37,6 +36,8 @@ class ReportManager(BaseReport):
     TFeatureReport = None
     TStepTools = None
     
+    _scenario_status_information_by_uid = {}
+    
     def __init__(self):
         super().__init__()
         
@@ -185,6 +186,10 @@ class ReportManager(BaseReport):
         # scenario_duration_tags = sdm.compute_scenario_duration_tags(duration_limit_tags, "long", missing_tag=True, new_tag=True, unchanged_tag=True, with_failed=True)
         # sdm.create_file_scenario_duration_tags(fn, scenario_duration_tags)
         
+        # Update campaigns stored in test server
+        if self._get_test_server_client().is_available:
+            self._get_test_server_client().update_stored_campaigns()
+        
     def __enter_current_scenario_log_file(self):
         if SessionContext.instance().log_manager.in_file and self.has_report_path:
             log_filename = self.current_scenario_report.get_path("logs", "report.log")
@@ -197,21 +202,66 @@ class ReportManager(BaseReport):
         if SessionContext.instance().log_manager.in_file and self.has_report_path:
             log_filename = self.current_scenario_report.get_path("logs", "report.log")
             SessionContext.instance().log_manager.leave_log_file(log_filename, do_remove_log_file=True)
-        
+    
+    @classmethod
+    def _get_test_server_client(cls):
+        return SessionContext.instance().test_server_client
+    
+    @classmethod
+    def _get_scenario_uid(cls, scenario):
+        return f"{scenario.filename} at l.{scenario.line}"
+    
     @classmethod
     def get_current_scenario_status_information(cls, scenario):
-        step_failed, step_nb = cls.get_step_failed_info(scenario)
-        
-        if step_failed is not None and hasattr(SessionContext.instance().get_scenario_context(), "is_in_preconditions") and SessionContext.instance().get_scenario_context().is_in_preconditions:
-            status = "Failed in Preconditions"
-        elif step_failed is not None and step_failed.keyword == "Given":
-            status = "Failed in Given"
-        elif step_failed is not None or scenario.status.has_failed():
-            status = "Failed"
-        else:
-            status = scenario.status.name.capitalize()
+        scenario_uid = cls._get_scenario_uid(scenario)
+        if scenario_uid not in cls._scenario_status_information_by_uid:
+            step_failed, step_nb = cls.get_step_failed_info(scenario)
             
-        return [status, step_failed, step_nb]
+            # Define scenario status
+            if step_failed is not None and hasattr(SessionContext.instance().get_scenario_context(), "is_in_preconditions") and SessionContext.instance().get_scenario_context().is_in_preconditions:
+                status = "Failed in Preconditions"
+            elif step_failed is not None and step_failed.keyword == "Given":
+                status = "Failed in Given"
+            elif step_failed is not None or scenario.status.has_failed():
+                status = "Failed"
+            else:
+                status = scenario.status.name.capitalize()
+            
+            # Define scenario category
+            category = None
+            if cls._get_test_server_client().is_available:
+                # Get scenario execution statuses
+                scenario_name = f"{scenario.filename} at l.{scenario.line}"
+                sce_hist = cls._get_test_server_client().get_scenario_history(scenario_name=scenario_name, size=10)
+                statuses = [s['status'] for s in sce_hist[0]['statuses']] if sce_hist else []
+                statuses.append(status)
+                
+                # Get scenario status sequences
+                passed_sequences = []
+                for status in statuses:
+                    if status == 'Passed':
+                        passed = True
+                    elif status.startswith("Failed"):
+                        passed = False
+                    else:
+                        continue
+                    if len(passed_sequences) == 0 or passed != passed_sequences[-1]:
+                        passed_sequences.append(passed)
+                
+                # Compute category
+                if passed_sequences:
+                    if len(passed_sequences) == 1:
+                        category = 'Success' if passed_sequences[0] else 'Failed'
+                    elif len(passed_sequences) > 2:
+                        category = 'Randomly Failed'
+                    elif passed_sequences[-1]:
+                        category = 'Newly Success'
+                    else:
+                        category = 'Newly Failed'
+            
+            cls._scenario_status_information_by_uid[scenario_uid] = [category, status, step_failed, step_nb]
+        
+        return cls._scenario_status_information_by_uid[scenario_uid]
         
     @classmethod
     def get_step_failed_info(cls, scenario):

holado_rest/api/rest/rest_client.py

@@ -55,7 +55,11 @@ class RestClient(Object):
         self.__kwargs = {}
             
         self.__request_log_level = Config.log_level_rest_request
-        
+    
+    @property
+    def url(self):
+        return self.__url
+    
     @property
     def request_log_level(self):
         return self.__request_log_level

holado_test/__init__.py

@@ -23,5 +23,8 @@ def register():
     from holado_test.behave.behave_manager import BehaveManager
     SessionContext.instance().services.register_service_type("behave_manager", BehaveManager)
     
+    from holado_test.test_server.client.rest.test_server_client import TestServerClient
+    SessionContext.instance().services.register_service_type("test_server_client", TestServerClient.new_client)
+    
 
 

holado_test/common/context/feature_context.py

@@ -13,10 +13,10 @@
 
 from builtins import super
 from holado.common.context.context import Context
-from datetime import datetime
 from holado_core.common.exceptions.technical_exception import TechnicalException
 from holado_scripting.common.tools.variable_manager import VariableManager
 from holado.common.context.session_context import SessionContext
+from holado_python.common.tools.datetime import DateTime
 
 class FeatureContext(Context):
     def __init__(self, feature):
@@ -24,7 +24,7 @@ class FeatureContext(Context):
         
         self.__feature = feature
         
-        self.__start_date = datetime.now()
+        self.__start_date = DateTime.now()
         self.__end_date = None
         self.__scenarios = []
     
@@ -64,7 +64,7 @@ class FeatureContext(Context):
         self.__scenarios.append(scenario_context)
     
     def end(self):
-        self.__end_date = datetime.now()
+        self.__end_date = DateTime.now()
         
     def has_variable_manager(self):
         return self.has_object("variable_manager")

holado_test/common/context/scenario_context.py

@@ -21,10 +21,10 @@ from holado_scripting.common.tools.expression_evaluator import ExpressionEvaluat
 from holado.common.context.session_context import SessionContext
 from holado_core.common.block.scope_manager import ScopeManager
 from holado_core.common.block.block_manager import BlockManager
-from datetime import datetime
 from holado_core.common.exceptions.technical_exception import TechnicalException
 from holado_scripting.text.verifier.text_verifier import TextVerifier
 from holado_multitask.multitasking.multitask_manager import MultitaskManager
+from holado_python.common.tools.datetime import DateTime
 
 logger = logging.getLogger(__name__)
 
@@ -35,7 +35,7 @@ class ScenarioContext(Context):
         
         self.__scenario = scenario
         
-        self.__start_date = datetime.now()
+        self.__start_date = DateTime.now()
         self.__end_date = None
         
         self.__main_thread_uid = SessionContext.instance().multitask_manager.main_thread_uid
@@ -150,7 +150,7 @@ class ScenarioContext(Context):
         return self.get_object("expression_evaluator")
     
     def end(self):
-        self.__end_date = datetime.now()
+        self.__end_date = DateTime.now()
 
 
         

holado_test/common/context/step_context.py

@@ -14,7 +14,7 @@
 from builtins import super
 from holado.common.context.context import Context
 import logging
-from datetime import datetime
+from holado_python.common.tools.datetime import DateTime
 
 logger = logging.getLogger(__name__)
 
@@ -26,7 +26,7 @@ class StepContext(Context):
         self.__step = step
         self.__status = None
         
-        self.__start_date = datetime.now()
+        self.__start_date = DateTime.now()
         self.__end_date = None
     
     def __str__(self):
@@ -60,7 +60,7 @@ class StepContext(Context):
             return None
     
     def end(self):
-        self.__end_date = datetime.now()
+        self.__end_date = DateTime.now()
     
 
         

holado_test/test_server/client/rest/test_server_client.py

@@ -0,0 +1,117 @@
+
+#################################################
+# 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_rest.api.rest.rest_client import RestClient
+import socket
+import urllib.parse
+import re
+from holado_rest.api.rest.rest_manager import RestManager
+from holado.common.handlers.undefined import undefined_argument, undefined_value
+import os
+from holado_core.common.tools.converters.converter import Converter
+
+logger = logging.getLogger(__name__)
+
+
+class TestServerClient(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_TEST_SERVER_URL", undefined_value)
+            if url is undefined_value:
+                scheme = kwargs.get('scheme', undefined_value)
+                if scheme is undefined_value:
+                    scheme = os.getenv("HOLADO_TEST_SERVER_SCHEME", "http")
+                host = kwargs.get('host', undefined_value)
+                if host is undefined_value:
+                    host = "localhost" if use_localhost else os.getenv("HOLADO_TEST_SERVER_HOST", "holado_test_server")
+                port = kwargs.get('port', undefined_value)
+                if port is undefined_value:
+                    port = os.getenv("HOLADO_TEST_SERVER_PORT", 51232)
+                
+                if port is None:
+                    url = f"{scheme}://{host}"
+                else:
+                    url = f"{scheme}://{host}:{port}"
+            kwargs['url'] = url
+        
+        manager = RestManager(default_client_class=cls)
+        res = manager.new_client(**kwargs)
+        
+        return res
+    
+    
+    def __init__(self, name, url, headers=None):
+        super().__init__(name, url, headers)
+        
+        self.__is_available = None
+    
+    @property
+    def is_available(self):
+        if self.__is_available is None:
+            self.__is_available = self.ping()
+            logger.info(f"Test server is {'not ' if not self.__is_available else ''}available")
+        return self.__is_available
+    
+    def ping(self):
+        url_parsed = urllib.parse.urlparse(self.url)
+        netloc_pattern = r"(?P<host>.*?)(?::(?P<port>\d+))?$"
+        m = re.match(netloc_pattern, url_parsed.netloc)
+        host = m.group('host')
+        port = Converter.to_integer(m.group('port'))
+        
+        sock = socket.socket(socket.AF_INET,socket.SOCK_STREAM)
+        sock.settimeout(1)
+        try:
+            sock.connect((host,port))
+        except Exception as exc:
+            logger.debug(f"Ping of test server failed for ({host}, {port}): {str(exc)}")
+            return False
+        else:
+            sock.close()
+            logger.debug(f"Ping of test server succeeded")
+            return True
+        
+    
+    # Manage campaigns actions
+    
+    def update_stored_campaigns(self):
+        response = self.put(f"campaign/update")
+        return self.response_result(response, status_ok=[200, 204])
+    
+    def get_scenario_history(self, scenario_name=None, size=None):
+        data = {}
+        if scenario_name is not None:
+            data['scenario_name'] = scenario_name
+        if size is not None:
+            data['size'] = size
+            
+        if data:
+            response = self.get(f"campaign/scenario/history", json=data)
+        else:
+            response = self.get(f"campaign/scenario/history", json=data)
+        
+        return self.response_result(response, status_ok=[200, 204])
+    
+    
+    
+    
+    

holado_test/test_server/server/run_test_server_in_docker.sh

@@ -12,8 +12,8 @@
 #     Have access to any HolAdo registry.
 #
 #     Optionally, define in .profile the following variables
-#         - HOLADO_TEST_SERVER_NAME: name of the container
-#         - HOLADO_TEST_SERVER_PORT: REST API port to use (default: 8001)
+#         - HOLADO_TEST_SERVER_HOST: host of test-server, or name of its container
+#         - HOLADO_TEST_SERVER_PORT: REST API port to use (default: 51232)
 #         - HOLADO_IMAGE_REGISTRY: docker image registry to use (default: holado/test_server)
 #         - HOLADO_IMAGE_TAG: docker image tag to use (default: latest)
 #         - HOLADO_OUTPUT_BASEDIR: absolute path to base output directory (default: [HOME]/.holado/output)
@@ -75,21 +75,21 @@ fi
 
 # Define port to use
 if [[ -z "$HOLADO_TEST_SERVER_PORT" ]]; then
-    HOLADO_TEST_SERVER_PORT=8001
+    HOLADO_TEST_SERVER_PORT=51232
 fi
 
 
 # Docker run 
-if [[ -z "$HOLADO_TEST_SERVER_NAME" ]]; then
-    HOLADO_TEST_SERVER_NAME=holado_test_server
+if [[ -z "$HOLADO_TEST_SERVER_HOST" ]]; then
+    HOLADO_TEST_SERVER_HOST=holado_test_server
 fi
 
 echo
-echo "Running Test Server (docker name: ${HOLADO_TEST_SERVER_NAME})..."
+echo "Running Test Server (docker name: ${HOLADO_TEST_SERVER_HOST})..."
 echo "    port: ${HOLADO_TEST_SERVER_PORT}"
 #echo "    NETWORK_DEF_COMMAND=${NETWORK_DEF_COMMAND}"
 echo
-docker run --rm --user root --name ${HOLADO_TEST_SERVER_NAME} \
+docker run --rm --user root --name ${HOLADO_TEST_SERVER_HOST} \
     -v "${OUTPUT_DIR}":/output \
     -v "${RESOURCES_DIR}":/resources \
     -e HOLADO_OUTPUT_BASEDIR=/output \

holado_value/common/tools/unique_value_manager.py

@@ -17,6 +17,7 @@ from datetime import datetime
 import string
 from holado_core.common.exceptions.technical_exception import TechnicalException
 from holado_core.common.tools.tools import Tools
+from holado_python.common.tools.datetime import DateTime
 
 logger = logging.getLogger(__name__)
 
@@ -41,7 +42,7 @@ class UniqueValueManager(object):
     def new_integer(self, do_log=True):
         if self.__last_unique_int is None:
             # Compute timestamp as number of seconds since 01/01/2016
-            self.__last_unique_int = int((datetime.now() - datetime(2020, 1, 1)).total_seconds()) - 1
+            self.__last_unique_int = int((DateTime.now(tz=None) - datetime(2020, 1, 1)).total_seconds()) - 1
             
         self.__last_unique_int += 1
         res = self.__last_unique_int

test_holado/environment.py

@@ -22,7 +22,7 @@ here = os.path.abspath(os.path.dirname(__file__))
 sys.path.insert(0, here)
 
 # 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()
 
 

test_holado/logging.conf

@@ -36,6 +36,7 @@ holado_s3.tools.s3.minio_client.trace=INFO
 
 #holado_system=DEBUG
 #holado_test.behave.behave=DEBUG
+holado_test.test_server=DEBUG
 #holado_yaml=DEBUG
 
 # External libraries

holado_docker/tools/docker_controller/docker_controller_manager.py

@@ -1,46 +0,0 @@
-
-#################################################
-# 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_core.common.tools.converters.converter import Converter
-import os
-from holado_docker.tools.docker_controller.client.rest.docker_controller_client import DockerControllerClient
-from holado_rest.api.rest.rest_manager import RestManager
-from holado.common.handlers.undefined import undefined_argument
-
-logger = logging.getLogger(__name__)
-
-
-class DockerControllerManager(object):
-    
-    @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)
-            
-            host = "localhost" if use_localhost else os.getenv("HOLADO_DOCKER_CONTROLLER_NAME", "holado_docker_controller")
-            port = os.getenv("HOLADO_DOCKER_CONTROLLER_PORT", 8000)
-            kwargs['url'] = f"http://{host}:{port}"
-        
-        manager = RestManager(default_client_class=DockerControllerClient)
-        res = manager.new_client(**kwargs)
-        
-        return res
-        
-        
-        
-