testit-python-commons 4.1.7__tar.gz → 4.1.8__tar.gz

{testit_python_commons-4.1.7 → testit_python_commons-4.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: testit-python-commons
-Version: 4.1.7
+Version: 4.1.8
 Summary: Python commons for Test IT
 Home-page: https://github.com/testit-tms/adapters-python/
 Author: Integration team

{testit_python_commons-4.1.7 → testit_python_commons-4.1.8}/setup.py

@@ -1,6 +1,6 @@
 from setuptools import find_packages, setup
 
-VERSION = "4.1.7"
+VERSION = "4.1.8"
 
 setup(
     name='testit-python-commons',

{testit_python_commons-4.1.7 → testit_python_commons-4.1.8}/src/testit_python_commons/app_properties.py

@@ -161,11 +161,13 @@ class AppProperties:
             # import realtime false by default
             properties[PropertiesNames.IMPORT_REALTIME] = 'false'
 
-        print(f'sync storage value {properties.get(PropertiesNames.SYNC_STORAGE_PORT)}')
         if not cls.__check_property_value(properties.get(PropertiesNames.SYNC_STORAGE_PORT)):
             # import realtime false by default
             properties[PropertiesNames.SYNC_STORAGE_PORT] = '49152'
 
+        if not cls.__check_property_value(properties.get(PropertiesNames.LEGACY_WORKFLOW)):
+            properties[PropertiesNames.LEGACY_WORKFLOW] = 'false'
+
     @classmethod
     def __load_file_properties_from_toml(cls) -> dict:
         properties = {}

{testit_python_commons-4.1.7 → testit_python_commons-4.1.8}/src/testit_python_commons/client/client_configuration.py

@@ -22,6 +22,8 @@ class ClientConfiguration:
         self.__automatic_updation_links_to_test_cases = Utils.convert_value_str_to_bool(
             app_properties.get(PropertiesNames.AUTOMATIC_UPDATION_LINKS_TO_TEST_CASES).lower())
         self.__sync_storage_port = app_properties.get(PropertiesNames.SYNC_STORAGE_PORT)
+        self.__legacy_workflow = Utils.convert_value_str_to_bool(
+            app_properties.get(PropertiesNames.LEGACY_WORKFLOW).lower())
 
     @adapter_logger
     def get_url(self):
@@ -67,3 +69,6 @@ class ClientConfiguration:
 
     def get_sync_storage_port(self) -> str:
         return self.__sync_storage_port
+
+    def is_legacy_workflow(self) -> bool:
+        return self.__legacy_workflow

{testit_python_commons-4.1.7 → testit_python_commons-4.1.8}/src/testit_python_commons/configurations/properties_names.py

@@ -14,6 +14,7 @@ class PropertiesNames:
     AUTOMATIC_UPDATION_LINKS_TO_TEST_CASES = 'automaticupdationlinkstotestcases'
     IMPORT_REALTIME = 'importrealtime'
     SYNC_STORAGE_PORT = 'syncstorageport'
+    LEGACY_WORKFLOW = 'legacyworkflow'
 
 ENV_TO_PROPERTY = {
     'TMS_URL': PropertiesNames.URL,
@@ -29,6 +30,7 @@ ENV_TO_PROPERTY = {
     'TMS_AUTOMATIC_UPDATION_LINKS_TO_TEST_CASES': PropertiesNames.AUTOMATIC_UPDATION_LINKS_TO_TEST_CASES,
     'TMS_IMPORT_REALTIME': PropertiesNames.IMPORT_REALTIME,
     'TMS_SYNC_STORAGE_PORT': PropertiesNames.SYNC_STORAGE_PORT,
+    'TMS_LEGACY_WORKFLOW': PropertiesNames.LEGACY_WORKFLOW,
 }
 
 OPTION_TO_PROPERTY = {
@@ -45,4 +47,5 @@ OPTION_TO_PROPERTY = {
     'set_automatic_updation_links_to_test_cases': PropertiesNames.AUTOMATIC_UPDATION_LINKS_TO_TEST_CASES,
     'set_import_realtime': PropertiesNames.IMPORT_REALTIME,
     'set_sync_storage_port': PropertiesNames.SYNC_STORAGE_PORT,
+    'set_legacy_workflow': PropertiesNames.LEGACY_WORKFLOW,
 }

{testit_python_commons-4.1.7 → testit_python_commons-4.1.8}/src/testit_python_commons/models/link.py

@@ -31,6 +31,9 @@ class Link:
 
     @adapter_logger
     def set_link_type(self, link_type: LinkType):
+        if link_type is None:
+            link_type = LinkType.RELATED
+
         self.__link_type = link_type
 
         return self

testit_python_commons-4.1.8/src/testit_python_commons/services/__init__.py

@@ -0,0 +1,41 @@
+from pluggy import HookimplMarker
+
+__all__ = [
+        "AdapterManager",
+        "TmsPluginManager",
+        "FixtureManager",
+        "StepManager",
+        "Utils",
+        "SyncStorageRunner",
+        "hookimpl",
+    ]
+
+hookimpl = HookimplMarker("testit")
+
+
+def __getattr__(name):
+    if name == "AdapterManager":
+        from testit_python_commons.services.adapter_manager import AdapterManager
+
+        return AdapterManager
+    if name == "TmsPluginManager":
+        from testit_python_commons.services.plugin_manager import TmsPluginManager
+
+        return TmsPluginManager
+    if name == "FixtureManager":
+        from testit_python_commons.services.fixture_manager import FixtureManager
+
+        return FixtureManager
+    if name == "StepManager":
+        from testit_python_commons.services.step_manager import StepManager
+
+        return StepManager
+    if name == "Utils":
+        from testit_python_commons.services.utils import Utils
+
+        return Utils
+    if name == "SyncStorageRunner":
+        from testit_python_commons.services.sync_storage import SyncStorageRunner
+
+        return SyncStorageRunner
+    raise AttributeError(f"module {__name__!r} has no attribute {name!r}")

{testit_python_commons-4.1.7 → testit_python_commons-4.1.8}/src/testit_python_commons/services/adapter_manager.py

@@ -38,8 +38,9 @@ class AdapterManager:
 
         # Sync Storage integration
         self.__sync_storage_runner = None
+        legacy_workflow_enabled = client_configuration.is_legacy_workflow() is True
         # Initialize Sync Storage if available and enabled
-        if SYNC_STORAGE_AVAILABLE:
+        if SYNC_STORAGE_AVAILABLE and not legacy_workflow_enabled:
             self.__sync_storage_runner = self._initialize_sync_storage(
                 client_configuration
             )
@@ -63,7 +64,7 @@ class AdapterManager:
             url = client_configuration.get_url()
             private_token = client_configuration.get_private_token()
             port = client_configuration.get_sync_storage_port()
-            print(f'sync storage port: {url} {private_token} {port}')
+            print(f'sync storage port: {port}')
 
             # Create and start Sync Storage runner
             if SYNC_STORAGE_AVAILABLE:
@@ -146,11 +147,11 @@ class AdapterManager:
 
         # for realtime false
         # if
-        logging.warning("Is already in progress: " + str(self.__is_already_in_progress()))
+        logging.debug("Is already in progress: " + str(self.__is_already_in_progress()))
         # Handle Sync Storage integration if available
         # Check if current worker is master and no test is in progress
         if self.__is_active_syncstorage_instance() and self.__is_master_and_no_in_progress():
-            logging.warning(f"Outcome: {test_result.get_outcome()}")
+            logging.debug(f"Outcome: {test_result.get_outcome()}")
             is_ok = self.on_master_no_already_in_progress(test_result)
             if is_ok:
                 return
@@ -167,9 +168,9 @@ class AdapterManager:
         tr_cut_api_model = SyncStorageRunner.test_result_to_test_result_cut_api_model(
             test_result, project_id
         )
-        logging.warning("Set as in progress status_code, auto_test_external_id: "
+        logging.debug("Set as in progress status_code, auto_test_external_id: "
                         + tr_cut_api_model.status_code + " " + tr_cut_api_model.auto_test_external_id)
-        logging.warning("Started_on: " + str(test_result.get_started_on()))
+        logging.debug("Started_on: " + str(test_result.get_started_on()))
 
         # Send test result to Sync Storage
         success = self.__sync_storage_runner.send_in_progress_test_result(
@@ -184,7 +185,7 @@ class AdapterManager:
 
         try:
             # Write test result normally (mark as IN PROGRESS in Test IT)
-            logging.warning("Write internally, change status to in progress")
+            logging.debug("Write internally, change status to in progress")
             test_result.set_outcome(IN_PROGRESS_LITERAL)
             self._write_test_realtime_internal(test_result)
             return True
@@ -199,7 +200,7 @@ class AdapterManager:
     @adapter_logger
     def __write_test_realtime(self, test_result: TestResult) -> None:
 
-        logging.warning("Is already in progress: " + str(self.__is_already_in_progress()))
+        logging.debug("Is already in progress: " + str(self.__is_already_in_progress()))
 
         # Handle Sync Storage integration if available
         if self.__is_active_syncstorage_instance() and self.__is_master_and_no_in_progress():
@@ -284,7 +285,7 @@ class AdapterManager:
 
     @adapter_logger
     def set_worker_status(self, status: str):
-        logging.info(f"Set worker_status to {status}")
+        logging.debug(f"Set worker_status to {status}")
         if not self.__is_active_syncstorage_instance():
             return
 

{testit_python_commons-4.1.7 → testit_python_commons-4.1.8}/src/testit_python_commons/services/utils.py

@@ -2,10 +2,18 @@ import inspect
 import logging
 import re
 import warnings
+from typing import TYPE_CHECKING
 
+<<<<<<< feat/small-fixes
+=======
 from testit_python_commons.models.link import Link
+from testit_python_commons.models.link_type import LinkType
+>>>>>>> main
 from testit_python_commons.services.logger import adapter_logger
 
+if TYPE_CHECKING:
+    from testit_python_commons.models.link import Link
+
 
 class Utils:
     @staticmethod
@@ -93,7 +101,9 @@ class Utils:
 
     @staticmethod
     @adapter_logger
-    def convert_link_dict_to_link_model(link_dict: dict) -> Link:
+    def convert_link_dict_to_link_model(link_dict: dict) -> "Link":
+        from testit_python_commons.models.link import Link
+
         link_model = Link()
         link_model.set_url(link_dict['url'])
 
@@ -101,7 +111,7 @@ class Utils:
             link_model.set_title(link_dict['title'])
 
         if 'type' in link_dict:
-            link_model.set_link_type(link_dict['type'])
+            link_model.set_link_type(link_dict.get('type', LinkType.RELATED))
 
         if 'description' in link_dict:
             link_model.set_description(link_dict['description'])

{testit_python_commons-4.1.7 → testit_python_commons-4.1.8}/src/testit_python_commons.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: testit-python-commons
-Version: 4.1.7
+Version: 4.1.8
 Summary: Python commons for Test IT
 Home-page: https://github.com/testit-tms/adapters-python/
 Author: Integration team

{testit_python_commons-4.1.7 → testit_python_commons-4.1.8}/tests/test_app_properties.py

@@ -34,7 +34,8 @@ class TestAppProperties:
             'certvalidation': "false",
             'automaticcreationtestcases': "true",
             'automaticupdationlinkstotestcases': "true",
-            'importrealtime': "false"
+            'importrealtime': "false",
+            'legacyworkflow': "false",
         }
 
     def test_load_file_properties_ini_file(self, create_config_file, tmp_path, mocker):
@@ -81,6 +82,7 @@ class TestAppProperties:
             f"{self.__env_prefix}_AUTOMATIC_CREATION_TEST_CASES": properties["automaticcreationtestcases"],
             f"{self.__env_prefix}_AUTOMATIC_UPDATION_LINKS_TO_TEST_CASES": properties["automaticupdationlinkstotestcases"],
             f"{self.__env_prefix}_IMPORT_REALTIME": properties["importrealtime"],
+            f"{self.__env_prefix}_LEGACY_WORKFLOW": properties["legacyworkflow"],
         }
         mocker.patch.dict(os.environ, env_vars, clear=True)
 
@@ -100,6 +102,7 @@ class TestAppProperties:
         mock_options.set_automatic_creation_test_cases = properties["automaticcreationtestcases"]
         mock_options.set_automatic_updation_links_to_test_cases = properties["automaticupdationlinkstotestcases"]
         mock_options.set_import_realtime = properties["importrealtime"]
+        mock_options.set_legacy_workflow = properties["legacyworkflow"]
 
         assert AppProperties.load_cli_properties(mock_options) == properties
 

{testit_python_commons-4.1.7 → testit_python_commons-4.1.8}/tests/test_dynamic_methods.py

@@ -14,7 +14,7 @@ class TestDynamicMethods:
         return Utils.convert_link_dict_to_link_model({
             "url": "https://www.example.com",
             "title": ''.join(random.choices(string.ascii_letters + string.digits, k=10)),
-            "type": LinkType.ISSUE,
+            "type": LinkType.RELATED,
             "description": ''.join(random.choices(string.ascii_letters + string.digits, k=10))
         })
 

testit_python_commons-4.1.7/src/testit_python_commons/services/__init__.py

@@ -1,20 +0,0 @@
-from pluggy import HookimplMarker
-
-from testit_python_commons.services.adapter_manager import AdapterManager
-from testit_python_commons.services.fixture_manager import FixtureManager
-from testit_python_commons.services.plugin_manager import TmsPluginManager
-from testit_python_commons.services.step_manager import StepManager
-from testit_python_commons.services.utils import Utils
-from .sync_storage import (SyncStorageRunner)
-
-__all__ = [
-        "AdapterManager",
-        "TmsPluginManager",
-        "FixtureManager",
-        "StepManager",
-        "Utils",
-        "SyncStorageRunner",
-        "hookimpl",
-    ]
-
-hookimpl = HookimplMarker("testit")