testit-python-commons 4.0.0__tar.gz → 4.1.0.post570__tar.gz

{testit_python_commons-4.0.0 → testit_python_commons-4.1.0.post570}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: testit-python-commons
-Version: 4.0.0
+Version: 4.1.0.post570
 Summary: Python commons for Test IT
 Home-page: https://github.com/testit-tms/adapters-python/
 Author: Integration team
@@ -17,7 +17,7 @@ Classifier: Programming Language :: Python :: 3.12
 Description-Content-Type: text/markdown
 Requires-Dist: pluggy
 Requires-Dist: tomli
-Requires-Dist: testit-api-client==7.5.3
+Requires-Dist: testit-api-client==7.5.5.post570
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{testit_python_commons-4.0.0 → testit_python_commons-4.1.0.post570}/setup.py

@@ -1,6 +1,6 @@
 from setuptools import find_packages, setup
 
-VERSION = "4.0.0"
+VERSION = "4.1.0.post570"
 
 setup(
     name='testit-python-commons',
@@ -25,5 +25,5 @@ setup(
     py_modules=['testit', 'testit_python_commons'],
     packages=find_packages(where='src'),
     package_dir={'': 'src'},
-    install_requires=['pluggy', 'tomli', 'testit-api-client==7.5.3']
+    install_requires=['pluggy', 'tomli', 'testit-api-client==7.5.5.post570']
 )

{testit_python_commons-4.0.0 → testit_python_commons-4.1.0.post570}/src/api_client_syncstorage/model/test_result_cut_api_model.py

@@ -81,8 +81,10 @@ class TestResultCutApiModel(ModelNormal):
                 and the value is attribute type.
         """
         return {
+            'project_id': (str,),  # noqa: E501
             'auto_test_external_id': (str,),  # noqa: E501
             'status_code': (str,),  # noqa: E501
+            'status_type': (str,),  # noqa: E501
             'started_on': (datetime, none_type,),  # noqa: E501
         }
 
@@ -92,8 +94,10 @@ class TestResultCutApiModel(ModelNormal):
 
 
     attribute_map = {
+        'project_id': 'projectId',  # noqa: E501
         'auto_test_external_id': 'autoTestExternalId',  # noqa: E501
         'status_code': 'statusCode',  # noqa: E501
+        'status_type': 'statusType',  # noqa: E501
         'started_on': 'startedOn',  # noqa: E501
     }
 
@@ -138,8 +142,10 @@ class TestResultCutApiModel(ModelNormal):
                                 Animal class but this time we won't travel
                                 through its discriminator because we passed in
                                 _visited_composed_classes = (Animal,)
+            project_id (str): [optional]  # noqa: E501
             auto_test_external_id (str): [optional]  # noqa: E501
             status_code (str): [optional]  # noqa: E501
+            status_type (str): [optional]  # noqa: E501
             started_on (datetime, none_type): [optional]  # noqa: E501
         """
 
@@ -226,8 +232,10 @@ class TestResultCutApiModel(ModelNormal):
                                 Animal class but this time we won't travel
                                 through its discriminator because we passed in
                                 _visited_composed_classes = (Animal,)
+            project_id (str): [optional]  # noqa: E501
             auto_test_external_id (str): [optional]  # noqa: E501
             status_code (str): [optional]  # noqa: E501
+            status_type (str): [optional]  # noqa: E501
             started_on (datetime, none_type): [optional]  # noqa: E501
         """
 

{testit_python_commons-4.0.0 → testit_python_commons-4.1.0.post570}/src/testit_python_commons/client/api_client.py

@@ -3,7 +3,15 @@ import os
 from datetime import datetime
 
 from testit_api_client import ApiClient, Configuration
-from testit_api_client.apis import AttachmentsApi, AutoTestsApi, TestRunsApi, TestResultsApi, WorkItemsApi
+from testit_api_client.apis import (
+    AttachmentsApi,
+    AutoTestsApi,
+    TestRunsApi,
+    TestResultsApi,
+    WorkItemsApi,
+    ProjectsApi,
+    WorkflowsApi,
+)
 from testit_api_client.models import (
     ApiV2TestResultsSearchPostRequest,
     AutoTestApiResult,
@@ -15,6 +23,8 @@ from testit_api_client.models import (
     TestRunV2ApiResult,
     LinkAutoTestToWorkItemRequest,
     AutoTestWorkItemIdentifierApiResult,
+    ProjectModel,
+    WorkflowApiResult,
 )
 
 from testit_python_commons.client.client_configuration import ClientConfiguration
@@ -41,7 +51,10 @@ class ApiClientWorker:
         self.__attachments_api = AttachmentsApi(api_client=api_client)
         self.__test_results_api = TestResultsApi(api_client=api_client)
         self.__work_items_api = WorkItemsApi(api_client=api_client)
+        self.__projects_api = ProjectsApi(api_client=api_client)
+        self.__workflows_api = WorkflowsApi(api_client=api_client)
         self.__config = config
+        self.__status_codes = self.__get_status_codes()
 
     @staticmethod
     @adapter_logger
@@ -179,7 +192,8 @@ class ApiClientWorker:
 
             test_result_model = Converter.test_result_to_testrun_result_post_model(
                 test_result,
-                self.__config.get_configuration_id())
+                self.__config.get_configuration_id(),
+                self.__status_codes)
 
             work_item_ids_for_link_with_auto_test = self.__get_work_item_uuids_for_link_with_auto_test(
                 test_result.get_work_item_ids())
@@ -385,7 +399,8 @@ class ApiClientWorker:
     def __load_test_result(self, test_result: TestResult) -> str:
         model = Converter.test_result_to_testrun_result_post_model(
             test_result,
-            self.__config.get_configuration_id())
+            self.__config.get_configuration_id(),
+            self.__status_codes)
 
         response = self.__test_run_api.set_auto_test_results_for_test_run(
             id=self.__config.get_test_run_id(),
@@ -407,8 +422,8 @@ class ApiClientWorker:
             fixtures_containers, test_result_ids)
 
         for test_result in test_results:
-            model = Converter.convert_test_result_model_to_test_results_id_put_request(
-                self.get_test_result_by_id(test_result.get_test_result_id()))
+            test_result_response = self.get_test_result_by_id(test_result.get_test_result_id())
+            model = Converter.convert_test_result_model_to_test_results_id_put_request(test_result_response)
 
             model.setup_results = Converter.step_results_to_auto_test_step_result_update_request(
                     test_result.get_setup_results())
@@ -441,4 +456,19 @@ class ApiClientWorker:
         return attachments
 
     def get_configuration_id(self):
-        return self.__config.get_configuration_id()
+        return self.__config.get_configuration_id()
+
+    @adapter_logger
+    def __get_project(self) -> ProjectModel:
+        return self.__projects_api.get_project_by_id(id=self.__config.get_project_id())
+
+    @adapter_logger
+    def __get_workflow_by_id(self, workflow_id: str) -> WorkflowApiResult:
+        return self.__workflows_api.api_v2_workflows_id_get(id=workflow_id)
+
+    @adapter_logger
+    def __get_status_codes(self) -> List[str]:
+        project: ProjectModel = self.__get_project()
+        workflow: WorkflowApiResult = self.__get_workflow_by_id(project.workflow_id)
+
+        return [status.code for status in workflow.statuses]

{testit_python_commons-4.0.0 → testit_python_commons-4.1.0.post570}/src/testit_python_commons/client/converter.py

@@ -32,6 +32,8 @@ from testit_api_client.models import (
     LinkApiResult,
     UpdateLinkApiModel,
     AssignAttachmentApiModel,
+    TestStatusType,
+    TestStatusApiType,
 )
 
 from testit_python_commons.models.link import Link
@@ -109,7 +111,7 @@ class Converter:
         return ApiV2TestResultsSearchPostRequest(
             test_run_ids=[testrun_id],
             configuration_ids=[configuration_id],
-            status_codes=["InProgress"])
+            status_types=[TestStatusApiType("InProgress")])
 
     @staticmethod
     @adapter_logger
@@ -197,46 +199,25 @@ class Converter:
             cls,
             test_result: TestResult,
             project_id: str) -> AutoTestUpdateApiModel:
-        if test_result.get_outcome() == 'Passed':
-            return AutoTestUpdateApiModel(
-                external_id=test_result.get_external_id(),
-                project_id=project_id,
-                name=test_result.get_autotest_name(),
-                steps=cls.step_results_to_autotest_steps_model(
-                    test_result.get_step_results()),
-                setup=cls.step_results_to_autotest_steps_model(
-                    test_result.get_setup_results()),
-                teardown=cls.step_results_to_autotest_steps_model(
-                    test_result.get_teardown_results()),
-                namespace=test_result.get_namespace(),
-                classname=test_result.get_classname(),
-                title=test_result.get_title(),
-                description=test_result.get_description(),
-                links=cls.links_to_links_put_model(test_result.get_links()),
-                labels=test_result.get_labels(),
-                tags=test_result.get_tags(),
-                external_key=test_result.get_external_key()
-            )
-        else:
-            return AutoTestUpdateApiModel(
-                external_id=test_result.get_external_id(),
-                project_id=project_id,
-                name=test_result.get_autotest_name(),
-                steps=cls.step_results_to_autotest_steps_model(
-                    test_result.get_step_results()),
-                setup=cls.step_results_to_autotest_steps_model(
-                    test_result.get_setup_results()),
-                teardown=cls.step_results_to_autotest_steps_model(
-                    test_result.get_teardown_results()),
-                namespace=test_result.get_namespace(),
-                classname=test_result.get_classname(),
-                title=test_result.get_title(),
-                description=test_result.get_description(),
-                links=cls.links_to_links_put_model(test_result.get_links()),
-                labels=test_result.get_labels(),
-                tags=test_result.get_tags(),
-                external_key=test_result.get_external_key()
-            )
+        return AutoTestUpdateApiModel(
+            external_id=test_result.get_external_id(),
+            project_id=project_id,
+            name=test_result.get_autotest_name(),
+            steps=cls.step_results_to_autotest_steps_model(
+                test_result.get_step_results()),
+            setup=cls.step_results_to_autotest_steps_model(
+                test_result.get_setup_results()),
+            teardown=cls.step_results_to_autotest_steps_model(
+                test_result.get_teardown_results()),
+            namespace=test_result.get_namespace(),
+            classname=test_result.get_classname(),
+            title=test_result.get_title(),
+            description=test_result.get_description(),
+            links=cls.links_to_links_put_model(test_result.get_links()),
+            labels=test_result.get_labels(),
+            tags=test_result.get_tags(),
+            external_key=test_result.get_external_key()
+        )
 
     @classmethod
     @adapter_logger
@@ -244,57 +225,37 @@ class Converter:
             cls,
             test_result: TestResult,
             project_id: str) -> UpdateAutoTestRequest:
-        if test_result.get_outcome() == 'Passed':
-            return UpdateAutoTestRequest(
-                external_id=test_result.get_external_id(),
-                project_id=project_id,
-                name=test_result.get_autotest_name(),
-                steps=cls.step_results_to_autotest_steps_model(
-                    test_result.get_step_results()),
-                setup=cls.step_results_to_autotest_steps_model(
-                    test_result.get_setup_results()),
-                teardown=cls.step_results_to_autotest_steps_model(
-                    test_result.get_teardown_results()),
-                namespace=test_result.get_namespace(),
-                classname=test_result.get_classname(),
-                title=test_result.get_title(),
-                description=test_result.get_description(),
-                links=cls.links_to_links_put_model(test_result.get_links()),
-                labels=test_result.get_labels(),
-                tags=test_result.get_tags(),
-                external_key=test_result.get_external_key()
-            )
-        else:
-            return UpdateAutoTestRequest(
-                external_id=test_result.get_external_id(),
-                project_id=project_id,
-                name=test_result.get_autotest_name(),
-                steps=cls.step_results_to_autotest_steps_model(
-                    test_result.get_step_results()),
-                setup=cls.step_results_to_autotest_steps_model(
-                    test_result.get_setup_results()),
-                teardown=cls.step_results_to_autotest_steps_model(
-                    test_result.get_teardown_results()),
-                namespace=test_result.get_namespace(),
-                classname=test_result.get_classname(),
-                title=test_result.get_title(),
-                description=test_result.get_description(),
-                links=cls.links_to_links_put_model(test_result.get_links()),
-                labels=test_result.get_labels(),
-                tags=test_result.get_tags(),
-                external_key=test_result.get_external_key()
-            )
+        return UpdateAutoTestRequest(
+            external_id=test_result.get_external_id(),
+            project_id=project_id,
+            name=test_result.get_autotest_name(),
+            steps=cls.step_results_to_autotest_steps_model(
+                test_result.get_step_results()),
+            setup=cls.step_results_to_autotest_steps_model(
+                test_result.get_setup_results()),
+            teardown=cls.step_results_to_autotest_steps_model(
+                test_result.get_teardown_results()),
+            namespace=test_result.get_namespace(),
+            classname=test_result.get_classname(),
+            title=test_result.get_title(),
+            description=test_result.get_description(),
+            links=cls.links_to_links_put_model(test_result.get_links()),
+            labels=test_result.get_labels(),
+            tags=test_result.get_tags(),
+            external_key=test_result.get_external_key()
+        )
 
     @classmethod
     @adapter_logger
     def test_result_to_testrun_result_post_model(
             cls,
             test_result: TestResult,
-            configuration_id: str) -> AutoTestResultsForTestRunModel:
-        return AutoTestResultsForTestRunModel(
+            configuration_id: str,
+            status_codes: List[str]) -> AutoTestResultsForTestRunModel:
+        model = AutoTestResultsForTestRunModel(
             configuration_id=configuration_id,
             auto_test_external_id=test_result.get_external_id(),
-            status_code=test_result.get_outcome(),
+            status_type=TestStatusType(test_result.get_status_type()),
             step_results=cls.step_results_to_attachment_put_model_autotest_step_results_model(
                 test_result.get_step_results()),
             setup_results=cls.step_results_to_attachment_put_model_autotest_step_results_model(
@@ -313,6 +274,11 @@ class Converter:
             completed_on=test_result.get_completed_on()
         )
 
+        if test_result.get_outcome().upper() in status_codes:
+            model.status_code = test_result.get_outcome()
+
+        return model
+
     @classmethod
     @adapter_logger
     def convert_test_result_model_to_test_results_id_put_request(

{testit_python_commons-4.0.0 → testit_python_commons-4.1.0.post570}/src/testit_python_commons/decorators.py

@@ -51,6 +51,9 @@ def workItemID(*test_workitems_id: int or str):  # noqa: N802
 
 @adapter_logger
 def workItemIds(*test_workitems_id: int or str):  # noqa: N802
+    """
+    specifies a method that links autotests with manual tests. Receives the array of manual tests' IDs
+    """
     def outer(function):  # noqa: N802
         function.test_workitems_id = []
         for test_workitem_id in test_workitems_id:
@@ -62,6 +65,9 @@ def workItemIds(*test_workitems_id: int or str):  # noqa: N802
 
 @adapter_logger
 def displayName(test_displayname: str):  # noqa: N802
+    """
+    specifies internal autotest name (used in Test IT)
+    """
     def outer(function):
         function.test_displayname = test_displayname
         return inner(function)
@@ -71,6 +77,9 @@ def displayName(test_displayname: str):  # noqa: N802
 
 @adapter_logger
 def nameSpace(test_namespace: str):  # noqa: N802
+    """
+    specifies directory in the TMS system (default - file's name of test)
+    """
     def outer(function):
         function.test_namespace = test_namespace
         return inner(function)
@@ -80,6 +89,9 @@ def nameSpace(test_namespace: str):  # noqa: N802
 
 @adapter_logger
 def className(test_classname: str):  # noqa: N802
+    """
+    specifies subdirectory in the TMS system (default - class's name of test)
+    """
     def outer(function):
         function.test_classname = test_classname
         return inner(function)
@@ -99,6 +111,9 @@ def externalID(test_external_id: str):  # noqa: N802
 
 @adapter_logger
 def externalId(test_external_id: str):  # noqa: N802
+    """
+    specifies unique internal autotest ID (used in Test IT)
+    """
     def outer(function):
         function.test_external_id = test_external_id
         return inner(function)
@@ -108,6 +123,10 @@ def externalId(test_external_id: str):  # noqa: N802
 
 @adapter_logger
 def title(test_title: str):
+    """
+    specifies autotest name specified in the autotest card.
+    If not specified, the name from the displayName method is used
+    """
     def outer(function):
         function.test_title = test_title
         return inner(function)
@@ -117,6 +136,9 @@ def title(test_title: str):
 
 @adapter_logger
 def description(test_description: str):
+    """
+    specifies autotest description specified in the autotest card
+    """
     def outer(function):
         function.test_description = test_description
         return inner(function)
@@ -127,6 +149,9 @@ def description(test_description: str):
 @Utils.deprecated('Use "tags" instead.')
 @adapter_logger
 def labels(*test_labels: str):
+    """
+    specifies labels listed in the autotest card
+    """
     def outer(function):
         function.test_labels = test_labels
         return inner(function)
@@ -136,6 +161,9 @@ def labels(*test_labels: str):
 
 @adapter_logger
 def tags(*test_tags: str):
+    """
+    specifies tags listed in the autotest card
+    """
     def outer(function):
         function.test_tags = test_tags
         return inner(function)
@@ -165,6 +193,9 @@ def link(url: str, title: str = None, type: str = None, description: str = None)
 @adapter_logger
 def links(url: str = None, title: str = None, type: str = None,  # noqa: A002,VNE003
           description: str = None, links: list or tuple = None):
+    """
+    specifies links listed in the autotest card
+    """
     def outer(function):
         if not hasattr(function, 'test_links'):
             function.test_links = []

{testit_python_commons-4.0.0 → testit_python_commons-4.1.0.post570}/src/testit_python_commons/dynamic_methods.py

@@ -21,6 +21,9 @@ def addLink(url: str, title: str = None, type: str = None, description: str = No
 @adapter_logger
 def addLinks(url: str = None, title: str = None, type: str = None, description: str = None,  # noqa: A002,VNE003,N802
              links: list or tuple = None):
+    """
+    links in the autotest result
+    """
     if hasattr(TmsPluginManager.get_plugin_manager().hook, 'add_link'):
         if url:
             TmsPluginManager.get_plugin_manager().hook \
@@ -51,6 +54,9 @@ def message(test_message: str):
 
 @adapter_logger
 def addMessage(test_message: str):   # noqa: N802
+    """
+    information about autotest in the autotest result
+    """
     if hasattr(TmsPluginManager.get_plugin_manager().hook, 'add_message'):
         TmsPluginManager.get_plugin_manager().hook \
             .add_message(test_message=test_message)
@@ -73,16 +79,19 @@ def attachments(*attachments_paths):
 
 @adapter_logger
 def addAttachments(data, is_text: bool = False, name: str = None):   # noqa: N802
+    """
+    uploading files in the autotest result
+    """
     active_step = TmsPluginManager.get_step_manager().get_active_step()
 
     if active_step:
-        add_attachments_to_step(active_step, data, is_text, name)
+        __add_attachments_to_step(active_step, data, is_text, name)
     else:
-        add_attachments_to_test(data, is_text, name)
+        __add_attachments_to_test(data, is_text, name)
 
 
 @adapter_logger
-def add_attachments_to_step(step, data, is_text: bool = False, name: str = None):
+def __add_attachments_to_step(step, data, is_text: bool = False, name: str = None):
     if is_text:
         attachment_ids = TmsPluginManager.get_adapter_manager().create_attachment(data, name)
     else:
@@ -98,7 +107,7 @@ def add_attachments_to_step(step, data, is_text: bool = False, name: str = None)
 
 
 @adapter_logger
-def add_attachments_to_test(data, is_text: bool = False, name: str = None):
+def __add_attachments_to_test(data, is_text: bool = False, name: str = None):
     if is_text and hasattr(TmsPluginManager.get_plugin_manager().hook, 'create_attachment'):
         TmsPluginManager.get_plugin_manager().hook \
             .create_attachment(
@@ -117,6 +126,9 @@ def add_attachments_to_test(data, is_text: bool = False, name: str = None):
 
 @adapter_logger
 def addWorkItemIds(*test_work_item_ids: int or str):  # noqa: N802
+    """
+    a dynamic method that links autotests with manual tests. Receives the array of manual tests' IDs
+    """
     if not hasattr(TmsPluginManager.get_plugin_manager().hook, 'add_work_item_id'):
         return
 
@@ -126,6 +138,9 @@ def addWorkItemIds(*test_work_item_ids: int or str):  # noqa: N802
 
 @adapter_logger
 def addDisplayName(test_display_name: str):  # noqa: N802
+    """
+    a dynamic method for adding internal autotest name (used in Test IT)
+    """
     if hasattr(TmsPluginManager.get_plugin_manager().hook, 'add_display_name'):
         TmsPluginManager.get_plugin_manager().hook \
             .add_display_name(test_display_name=str(test_display_name))
@@ -133,6 +148,9 @@ def addDisplayName(test_display_name: str):  # noqa: N802
 
 @adapter_logger
 def addNameSpace(test_namespace: str):  # noqa: N802
+    """
+    a dynamic method for adding directory in the TMS system (default - file's name of test)
+    """
     if hasattr(TmsPluginManager.get_plugin_manager().hook, 'add_namespace'):
         TmsPluginManager.get_plugin_manager().hook \
             .add_namespace(test_namespace=str(test_namespace))
@@ -140,6 +158,9 @@ def addNameSpace(test_namespace: str):  # noqa: N802
 
 @adapter_logger
 def addClassName(test_classname: str):  # noqa: N802
+    """
+    a dynamic method for adding subdirectory in the TMS system (default - class's name of test)
+    """
     if hasattr(TmsPluginManager.get_plugin_manager().hook, 'add_classname'):
         TmsPluginManager.get_plugin_manager().hook \
             .add_classname(test_classname=str(test_classname))
@@ -147,20 +168,29 @@ def addClassName(test_classname: str):  # noqa: N802
 
 @adapter_logger
 def addExternalId(test_external_id: str):  # noqa: N802
+    """
+    a dynamic method for adding unique internal autotest ID (used in Test IT)
+    """
     if hasattr(TmsPluginManager.get_plugin_manager().hook, 'add_external_id'):
         TmsPluginManager.get_plugin_manager().hook \
             .add_external_id(test_external_id=str(test_external_id))
 
 
 @adapter_logger
-def addTitle(test_title: str):
+def addTitle(test_title: str): # noqa: N802
+    """
+    a dynamic method for adding autotest name specified in the autotest card. If not specified, the name from the displayName method is used
+    """
     if hasattr(TmsPluginManager.get_plugin_manager().hook, 'add_title'):
         TmsPluginManager.get_plugin_manager().hook \
             .add_title(test_title=str(test_title))
 
 
 @adapter_logger
-def addDescription(test_description: str):
+def addDescription(test_description: str): # noqa: N802
+    """
+    a dynamic method for adding autotest description specified in the autotest card
+    """
     if hasattr(TmsPluginManager.get_plugin_manager().hook, 'add_description'):
         TmsPluginManager.get_plugin_manager().hook \
             .add_description(test_description=str(test_description))
@@ -168,7 +198,10 @@ def addDescription(test_description: str):
 
 @Utils.deprecated('Use "addTags" instead.')
 @adapter_logger
-def addLabels(*test_labels: str):
+def addLabels(*test_labels: str): # noqa: N802
+    """
+    a dynamic method for adding labels listed in the autotest card
+    """
     if not hasattr(TmsPluginManager.get_plugin_manager().hook, 'add_label'):
         return
 
@@ -177,7 +210,10 @@ def addLabels(*test_labels: str):
 
 
 @adapter_logger
-def addTags(*test_tags: str):
+def addTags(*test_tags: str): # noqa: N802
+    """
+    a dynamic method for adding tags listed in the autotest card
+    """
     if not hasattr(TmsPluginManager.get_plugin_manager().hook, 'add_tag'):
         return
 
@@ -186,7 +222,10 @@ def addTags(*test_tags: str):
 
 
 @adapter_logger
-def addParameter(name: str, value: str):
+def addParameter(name: str, value: str): # noqa: N802
+    """
+    a dynamic method for adding parameter in the autotest result
+    """
     if hasattr(TmsPluginManager.get_plugin_manager().hook, 'add_parameter'):
         TmsPluginManager.get_plugin_manager().hook \
             .add_parameter(name=str(name), value=str(value))

{testit_python_commons-4.0.0 → testit_python_commons-4.1.0.post570}/src/testit_python_commons/models/link_type.py

@@ -1,4 +1,7 @@
 class LinkType:
+    """
+    Test IT link type
+    """
     RELATED = 'Related'
     BLOCKED_BY = 'BlockedBy'
     DEFECT = 'Defect'

testit_python_commons-4.1.0.post570/src/testit_python_commons/models/status_type.py

@@ -0,0 +1,6 @@
+class StatusType:
+    SUCCEEDED = 'Succeeded'
+    FAILED = 'Failed'
+    INCOMPLETE = 'Incomplete'
+    INPROGRESS = 'InProgress'
+    PENDING = 'Pending'

{testit_python_commons-4.0.0 → testit_python_commons-4.1.0.post570}/src/testit_python_commons/models/test_result.py

@@ -10,6 +10,7 @@ class TestResult:
     __external_id: str = None
     __autotest_name: str = None
     __outcome: str = None
+    __status_type: str = None
     __title: str = None
     __description: str = None
     __duration: int = None
@@ -65,6 +66,16 @@ class TestResult:
     def get_outcome(self) -> str:
         return self.__outcome
 
+    @adapter_logger
+    def set_status_type(self, status_type: str):
+        self.__status_type = HtmlEscapeUtils.escape_html_tags(status_type)
+
+        return self
+
+    @adapter_logger
+    def get_status_type(self) -> str:
+        return self.__status_type
+
     @adapter_logger
     def set_title(self, title: str):
         self.__title = HtmlEscapeUtils.escape_html_tags(title)

{testit_python_commons-4.0.0 → testit_python_commons-4.1.0.post570}/src/testit_python_commons/services/adapter_manager.py

@@ -30,6 +30,7 @@ class AdapterManager:
     ):
 
         self.__config = adapter_configuration
+        self.__client_config = client_configuration
         self.__api_client = ApiClientWorker(client_configuration)
         self.__fixture_manager = fixture_manager
         self.__test_result_map = {}
@@ -161,11 +162,14 @@ class AdapterManager:
     @adapter_logger
     def on_master_no_already_in_progress(self, test_result: TestResult) -> bool:
         # Convert TestResult to TestResultCutApiModel
+
+        project_id = self.__client_config.get_project_id()
         tr_cut_api_model = SyncStorageRunner.test_result_to_test_result_cut_api_model(
-            test_result
+            test_result, project_id
         )
         logging.warning("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()))
 
         # Send test result to Sync Storage
         success = self.__sync_storage_runner.send_in_progress_test_result(

{testit_python_commons-4.0.0 → testit_python_commons-4.1.0.post570}/src/testit_python_commons/services/sync_storage/sync_storage_runner.py

@@ -39,13 +39,13 @@ class SyncStorageRunner:
     across multiple workers.
     """
 
-    SYNC_STORAGE_VERSION = "v0.1.18"
+    SYNC_STORAGE_VERSION = "v0.2.0-tms-5.7"
     SYNC_STORAGE_REPO_URL = (
         "https://github.com/testit-tms/sync-storage-public/releases/download/"
     )
     AMD64 = "amd64"
     ARM64 = "arm64"
-    SYNC_STORAGE_STARTUP_TIMEOUT = 30  # seconds
+    SYNC_STORAGE_STARTUP_TIMEOUT = 5  # seconds
 
     def __init__(
         self,
@@ -528,9 +528,11 @@ class SyncStorageRunner:
     @classmethod
     def test_result_to_test_result_cut_api_model(
             cls,
-            test_result: TestResult) -> TestResultCutApiModel:
+            test_result: TestResult, project_id: str) -> TestResultCutApiModel:
         return TestResultCutApiModel(
+            project_id=project_id,
             auto_test_external_id=test_result.get_external_id(),
+            status_type=test_result.get_status_type(),
             status_code=test_result.get_outcome(),
             started_on=test_result.get_started_on(),
         )

{testit_python_commons-4.0.0 → testit_python_commons-4.1.0.post570}/src/testit_python_commons/utils/html_escape_utils.py

@@ -123,7 +123,12 @@ class HtmlEscapeUtils:
                 # Skip private/protected attributes and methods
                 if attr_name.startswith('_') or callable(getattr(obj, attr_name, None)):
                     continue
-                if attr_name.startswith("external_id") or attr_name.startswith("externalId"):
+                if (
+                    attr_name.startswith("external_id")
+                    or attr_name.startswith("externalId")
+                    or attr_name.startswith("auto_test_external_id")
+                    or attr_name.startswith("autoTestExternalId")
+                ):
                     continue
                     
                 try:

{testit_python_commons-4.0.0 → testit_python_commons-4.1.0.post570}/src/testit_python_commons.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: testit-python-commons
-Version: 4.0.0
+Version: 4.1.0.post570
 Summary: Python commons for Test IT
 Home-page: https://github.com/testit-tms/adapters-python/
 Author: Integration team
@@ -17,7 +17,7 @@ Classifier: Programming Language :: Python :: 3.12
 Description-Content-Type: text/markdown
 Requires-Dist: pluggy
 Requires-Dist: tomli
-Requires-Dist: testit-api-client==7.5.3
+Requires-Dist: testit-api-client==7.5.5.post570
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{testit_python_commons-4.0.0 → testit_python_commons-4.1.0.post570}/src/testit_python_commons.egg-info/SOURCES.txt

@@ -52,6 +52,7 @@ src/testit_python_commons/models/fixture.py
 src/testit_python_commons/models/link.py
 src/testit_python_commons/models/link_type.py
 src/testit_python_commons/models/outcome_type.py
+src/testit_python_commons/models/status_type.py
 src/testit_python_commons/models/step_result.py
 src/testit_python_commons/models/test_result.py
 src/testit_python_commons/models/test_result_with_all_fixture_step_results_model.py

testit_python_commons-4.1.0.post570/src/testit_python_commons.egg-info/requires.txt

@@ -0,0 +1,3 @@
+pluggy
+tomli
+testit-api-client==7.5.5.post570

{testit_python_commons-4.0.0 → testit_python_commons-4.1.0.post570}/tests/test_html_escape_utils.py

@@ -10,6 +10,15 @@ class SampleData:
         self.tags = ["<tag>", "normal_tag"]
 
 
+class SampleExternalIdsData:
+    def __init__(self):
+        self.external_id = "<test>"
+        self.externalId = "<test-camel>"
+        self.auto_test_external_id = "<auto-test>"
+        self.autoTestExternalId = "<auto-test-camel>"
+        self.description = "<script>alert('xss')</script>"
+
+
 class TestHtmlEscapeUtils(unittest.TestCase):
 
     def test_escape_html_tags_basic(self):
@@ -70,6 +79,17 @@ class TestHtmlEscapeUtils(unittest.TestCase):
         self.assertEqual(result.tags[0], "&lt;tag&gt;")  # Escaped
         self.assertEqual(result.tags[1], "normal_tag")  # No escaping needed
 
+    def test_escape_html_in_object_skips_external_id_fields(self):
+        """Test that externalId fields are not escaped"""
+        test_obj = SampleExternalIdsData()
+        result = HtmlEscapeUtils.escape_html_in_object(test_obj)
+
+        self.assertEqual(result.external_id, "<test>")
+        self.assertEqual(result.externalId, "<test-camel>")
+        self.assertEqual(result.auto_test_external_id, "<auto-test>")
+        self.assertEqual(result.autoTestExternalId, "<auto-test-camel>")
+        self.assertEqual(result.description, "&lt;script&gt;alert('xss')&lt;/script&gt;")
+
     def test_escape_html_in_object_list(self):
         """Test HTML escaping in list of objects"""
         test_list = [

testit_python_commons-4.0.0/src/testit_python_commons.egg-info/requires.txt

@@ -1,3 +0,0 @@
-pluggy
-tomli
-testit-api-client==7.5.3