holado 0.22.1.dev5__tar.gz → 0.22.1.dev7__tar.gz

{holado-0.22.1.dev5 → holado-0.22.1.dev7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: holado
-Version: 0.22.1.dev5
+Version: 0.22.1.dev7
 Summary: HolAdo framework
 Project-URL: Homepage, https://gitlab.com/holado_framework/python
 Project-URL: Issues, https://gitlab.com/holado_framework/python/-/issues

holado-0.22.1.dev7/packaging/VERSION

@@ -0,0 +1 @@
+0.22.1.dev7

{holado-0.22.1.dev5 → holado-0.22.1.dev7}/src/holado_report/campaign/campaign_manager.py

@@ -305,7 +305,7 @@ class CampaignManager(object):
         # Note: order by scenario name to have same order than filesystem
         camp_scenarios_gen = client.select("campaign_scenarios", where_data=w_data, where_compare_data=w_compare_data,
                                            result_as_dict_list=True, as_generator=True,
-                                           order_bys=['executed_scenario_uid', ('scenario_version', 'DESC'), ('status_at', 'DESC')])
+                                           order_bys=['executed_scenario_uid', ('status_at', 'DESC')])
 
         # Build result
         res = []
@@ -342,7 +342,7 @@ class CampaignManager(object):
                 cur_res_version_data.append(data)
                 cur_res_size += 1
 
-        if scenario_uid is not None and len(res) > 0:
+        if executed_scenario_uid is not None and len(res) > 0:
             return res[0]['history_by_version']
         else:
             return res

{holado-0.22.1.dev5 → holado-0.22.1.dev7}/src/holado_test/behave/scenario/behave_scenario_tools.py

@@ -89,12 +89,12 @@ class BehaveScenarioTools(ScenarioTools):
         return res
 
     @classmethod
-    def get_scenario_version(cls, scenario, with_hash=False, with_line_number=False):
+    def _get_scenario_version_in_tag(cls, scenario, with_hash=False, with_line_number=False):
         res = [None] * sum([1, with_hash, with_line_number])
         for tag in scenario.tags:
             m = cls._scenario_version_tag_pattern.match(tag)
             if m:
-                res = [int(m.group('version'))]
+                res = [m.group('version')]
                 if with_hash:
                     res.append(m.group('hash'))
                 if with_line_number:

holado-0.22.1.dev7/src/holado_test/scenario/enums.py

@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+
+#################################################
+# 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 enum import Enum
+
+from holado.common.handlers.enums import AutoNumber
+
+logger = logging.getLogger(__name__)
+
+
+class ManageScenarioVersionMethod(AutoNumber):
+    """
+    How scenario version is managed:
+        - Deactivated: no version is managed
+        - VersionInTag: A tag is assigned to each scenario that stores the scenario version
+        - AutomaticByTestServer: Version corresponding to scenario hash is requested to test-server when needed.
+            If hash has changed compared to last version, a new version is automatically created by test-server, stored and associated to new hash.
+    """
+
+    Deactivated = ()
+    VersionInTag = ()
+    AutomaticByTestServer = ()
+
+

{holado-0.22.1.dev5 → holado-0.22.1.dev7}/src/holado_test/scenario/scenario_tools.py

@@ -17,6 +17,7 @@ import re
 from holado.common.context.session_context import SessionContext
 from holado.common.handlers.undefined import undefined_value
 from holado_core.common.exceptions.technical_exception import TechnicalException
+from holado_core.common.tools.converters.converter import Converter
 from holado_core.common.tools.tools import Tools
 from holado_data.data.encoder.BaseXEncoder import BaseXEncoder
 from holado_python.common.enums import ArithmeticOperator
@@ -24,6 +25,7 @@ from holado_python.common.tools.datetime import DateTime, DurationUnit
 from holado_python.common.tools.re_ext import pattern_to_format_string
 from holado_report.report.enums import ValidationCategory, ValidationStatus
 from holado_system.system.filesystem.file import File
+from holado_test.scenario.enums import ManageScenarioVersionMethod
 from holado_test.test_config import TestConfig
 
 logger = logging.getLogger(__name__)
@@ -182,7 +184,19 @@ class ScenarioTools(object):
         raise NotImplementedError()
 
     @classmethod
-    def get_scenario_version(cls, scenario, with_hash=False, with_line_number=False):
+    def get_scenario_version(cls, scenario):
+        match TestConfig.manage_scenario_version_method:
+            case ManageScenarioVersionMethod.Deactivated:
+                return ""
+            case ManageScenarioVersionMethod.VersionInTag:
+                return cls._get_scenario_version_in_tag(scenario)
+            case ManageScenarioVersionMethod.AutomaticByTestServer:
+                raise NotImplementedError()
+            case _:
+                raise TechnicalException(f"Unmanaged scenario version management method '{TestConfig.manage_scenario_version_method}'")
+
+    @classmethod
+    def _get_scenario_version_in_tag(cls, scenario, with_hash=False, with_line_number=False):
         raise NotImplementedError()
 
     @classmethod
@@ -602,34 +616,48 @@ class ScenarioTools(object):
 
     @classmethod
     def _manage_scenario_versions(cls):
-        """ Manage scenario versions.
+        """ Manage scenario versions according configured method. """
+        res = False
+
+        match TestConfig.manage_scenario_version_method:
+            case ManageScenarioVersionMethod.VersionInTag:
+                res = cls._manage_scenario_version_in_tag()
+            case ManageScenarioVersionMethod.Deactivated|ManageScenarioVersionMethod.AutomaticByTestServer:
+                # Nothing to do
+                pass
+            case _:
+                raise TechnicalException(f"Unmanaged scenario version management method '{TestConfig.manage_scenario_version_method}'")
+
+        return res
+
+    @classmethod
+    def _manage_scenario_version_in_tag(cls):
+        """ Manage scenario versions in tag.
         Actions managed depending on configuration:
           - Add/update automatically version if needed
           - Abort execution if any scenario hasn't version
         """
         res = False
 
-        if TestConfig.manage_scenario_version:
-            # Get elements info
-            scenarios_to_update = []
-            for scenario in cls.get_scenarios():
-                cur_version, cur_hash, line = cls.get_scenario_version(scenario, with_hash=True, with_line_number=True)
-                scenario_hash = cls.compute_scenario_hash(scenario)
-                if scenario_hash != cur_hash:
-                    scenarios_to_update.append((scenario, cur_version, scenario_hash, line))
-            # raise TechnicalException(f"Scenarios to update ({len(scenarios_to_update)}):\n" + '\n'.join([str(s) for s in scenarios_to_update[:10]]))
-
-            # Manage versions
-            if scenarios_to_update:
-                if TestConfig.update_automatically_version:
-                    cls._update_scenarios_versions(scenarios_to_update)
-                    res = True
-                elif TestConfig.abort_execution_on_missing_version:
-                    scenarios_without_version = [cls.get_scenario_short_description(si[0]) for si in scenarios_to_update if si[1] is None]
-                    cls._get_session_context().abort_execution(reason=f"{len(scenarios_without_version)} scenarios don't have version: {', '.join(scenarios_without_version)}")
-                elif TestConfig.abort_execution_on_wrong_version and not TestConfig.update_automatically_version:
-                    scenarios_with_wrong_version = [cls.get_scenario_short_description(si[0]) for si in scenarios_to_update if si[1] is not None]
-                    cls._get_session_context().abort_execution(reason=f"{len(scenarios_with_wrong_version)} scenarios need a version update: {', '.join(scenarios_with_wrong_version)}")
+        # Get elements info
+        scenarios_to_update = []
+        for scenario in cls.get_scenarios():
+            cur_version, cur_hash, line = cls._get_scenario_version_in_tag(scenario)
+            scenario_hash = cls.compute_scenario_hash(scenario)
+            if scenario_hash != cur_hash:
+                scenarios_to_update.append((scenario, cur_version, scenario_hash, line))
+
+        # Manage versions
+        if scenarios_to_update:
+            if TestConfig.update_automatically_version:
+                cls._update_scenarios_versions(scenarios_to_update)
+                res = True
+            elif TestConfig.abort_execution_on_missing_version:
+                scenarios_without_version = [cls.get_scenario_short_description(si[0]) for si in scenarios_to_update if si[1] is None]
+                cls._get_session_context().abort_execution(reason=f"{len(scenarios_without_version)} scenarios don't have version: {', '.join(scenarios_without_version)}")
+            elif TestConfig.abort_execution_on_wrong_version and not TestConfig.update_automatically_version:
+                scenarios_with_wrong_version = [cls.get_scenario_short_description(si[0]) for si in scenarios_to_update if si[1] is not None]
+                cls._get_session_context().abort_execution(reason=f"{len(scenarios_with_wrong_version)} scenarios need a version update: {', '.join(scenarios_with_wrong_version)}")
 
         return res
 
@@ -679,7 +707,7 @@ class ScenarioTools(object):
         m = cls._scenario_version_tag_pattern.search(file_lines[version_line - 1])
         if not m:
             raise TechnicalException(f"Failed to find version tag for scenario '{scenario.name}' in file '{file_path}' at line {version_line}")
-        new_version = current_version + 1
+        new_version = cls._next_version(current_version)
         new_version_tag = cls._scenario_version_tag_format.format(version=new_version, hash=scenario_hash)
         new_line = file_lines[version_line - 1][:m.start()] + new_version_tag + file_lines[version_line - 1][m.end():]
         file_lines[version_line - 1] = new_line
@@ -688,3 +716,14 @@ class ScenarioTools(object):
         File.write_file_with_lines(file_path, file_lines)
 
         logger.info(f"Updated version {new_version} for scenario '{scenario.name}' (in file '{file_path}' at line {version_line})")
+
+    @classmethod
+    def _next_version(cls, version):
+        if Converter.is_integer(version):
+            ver_int = Converter.to_integer(version)
+            return str(ver_int + 1)
+        elif m := re.match(r"^(\d+\.)(\d+)$", version):
+            ver_int = int(m.group(2))
+            return f"{m.group(1)}{ver_int + 1}"
+        else:
+            raise TechnicalException(f"Unexpected version '{version}'")

{holado-0.22.1.dev5 → holado-0.22.1.dev7}/src/holado_test/test_config.py

@@ -13,6 +13,7 @@
 
 import os
 from holado_core.common.tools.converters.converter import Converter
+from holado_test.scenario.enums import ManageScenarioVersionMethod
 
 
 class TestConfig(object):
@@ -42,7 +43,7 @@ class TestConfig(object):
     add_automatically_uid = Converter.to_boolean(os.getenv("HOLADO_TEST_ADD_AUTOMATICALLY_UID", True))
 
     # Scenario version management
-    manage_scenario_version = Converter.to_boolean(os.getenv("HOLADO_TEST_MANAGE_SCENARIO_VERSION", True))
+    manage_scenario_version_method = ManageScenarioVersionMethod[os.getenv("HOLADO_TEST_MANAGE_SCENARIO_VERSION_METHOD", "Deactivated")]
     scenario_version_tag_pattern = r"ScenarioVersion=(?P<version>\d+):(?P<hash>[^\s]+)"
     scenario_hash_size = 16
     scenario_example_row_hash_size = 4

holado-0.22.1.dev7/src/holado_test/tools/test_server/server/requirements.txt

@@ -0,0 +1,2 @@
+# HolAdo framework
+holado[api-connexion,ssl]>=0.22.1.dev6

holado-0.22.1.dev5/packaging/VERSION

@@ -1 +0,0 @@
-0.22.1.dev5

holado-0.22.1.dev5/src/holado_test/tools/test_server/server/requirements.txt

@@ -1,2 +0,0 @@
-# HolAdo framework
-holado[api-connexion,ssl]>=0.22.1.dev4