testit-python-commons 3.3.0__tar.gz → 3.3.2__tar.gz

{testit_python_commons-3.3.0 → testit_python_commons-3.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: testit-python-commons
-Version: 3.3.0
+Version: 3.3.2
 Summary: Python commons for Test IT
 Home-page: https://github.com/testit-tms/adapters-python/
 Author: Integration team
@@ -16,7 +16,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Description-Content-Type: text/markdown
 Requires-Dist: pluggy
-Requires-Dist: testit-api-client==4.2.0
+Requires-Dist: testit-api-client==5.0.0
 
 # How to enable debug logging?
 1. Add in **connection_config.ini** file from the root directory of the project:

{testit_python_commons-3.3.0 → testit_python_commons-3.3.2}/setup.py

@@ -2,7 +2,7 @@ from setuptools import find_packages, setup
 
 setup(
     name='testit-python-commons',
-    version='3.3.0',
+    version='3.3.2',
     description='Python commons for Test IT',
     long_description=open('README.md', "r").read(),
     long_description_content_type="text/markdown",
@@ -23,5 +23,5 @@ setup(
     py_modules=['testit', 'testit_python_commons'],
     packages=find_packages(where='src'),
     package_dir={'': 'src'},
-    install_requires=['pluggy', 'testit-api-client==4.2.0']
+    install_requires=['pluggy', 'testit-api-client==5.0.0']
 )

{testit_python_commons-3.3.0 → testit_python_commons-3.3.2}/src/testit_python_commons/client/api_client.py

@@ -4,11 +4,12 @@ import typing
 from datetime import datetime
 
 from testit_api_client import ApiClient, Configuration
-from testit_api_client.apis import AttachmentsApi, AutoTestsApi, TestRunsApi, TestResultsApi
+from testit_api_client.api import AttachmentsApi, AutoTestsApi, TestRunsApi, TestResultsApi
 from testit_api_client.models import (
     AttachmentPutModel,
     TestResultModel,
-    WorkItemIdModel
+    WorkItemIdModel,
+    WorkItemIdentifierModel
 )
 
 from testit_python_commons.client.client_configuration import ClientConfiguration
@@ -82,12 +83,12 @@ class ApiClientWorker:
             self.__config.get_project_id(),
             test_result.get_external_id())
 
-        autotest = self.__autotest_api.api_v2_auto_tests_search_post(api_v2_auto_tests_search_post_request=model)
+        autotests = self.__autotest_api.api_v2_auto_tests_search_post(autotests_select_model=model)
 
-        if autotest:
-            self.__update_test(test_result, autotest[0]['is_flaky'])
+        if autotests:
+            self.__update_test(test_result, autotests[0].is_flaky)
 
-            autotest_global_id = autotest[0]['id']
+            autotest_global_id = autotests[0].id
         else:
             autotest_global_id = self.__create_test(test_result)
 
@@ -97,16 +98,15 @@ class ApiClientWorker:
         return self.__load_test_result(test_result)
 
     @adapter_logger
-    def __get_work_items_linked_to_autotest(self, autotest_global_id: str) -> list:
+    def __get_work_items_linked_to_autotest(self, autotest_global_id: str) -> typing.List[WorkItemIdentifierModel]:
         return self.__autotest_api.get_work_items_linked_to_auto_test(id=autotest_global_id)
 
     @adapter_logger
     def __update_autotest_link_from_work_items(self, autotest_global_id: str, work_item_ids: list):
-
         linked_work_items = self.__get_work_items_linked_to_autotest(autotest_global_id)
 
         for linked_work_item in linked_work_items:
-            linked_work_item_id = str(linked_work_item['global_id'])
+            linked_work_item_id = str(linked_work_item.global_id)
 
             if linked_work_item_id in work_item_ids:
                 work_item_ids.remove(linked_work_item_id)
@@ -131,7 +131,7 @@ class ApiClientWorker:
 
         logging.debug(f'Autotest "{test_result.get_autotest_name()}" was created')
 
-        return autotest_response['id']
+        return autotest_response.id
 
     @adapter_logger
     def __update_test(self, test_result: TestResult, is_flaky: bool):
@@ -189,14 +189,10 @@ class ApiClientWorker:
             model = Converter.convert_test_result_model_to_test_results_id_put_request(
                 self.get_test_result_by_id(test_result.get_test_result_id()))
 
-            model.set_attribute(
-                "setup_results",
-                Converter.step_results_to_attachment_put_model_autotest_step_results_model(
-                    test_result.get_setup_results()))
-            model.set_attribute(
-                "teardown_results",
-                Converter.step_results_to_attachment_put_model_autotest_step_results_model(
-                    test_result.get_teardown_results()))
+            model.setup_results = Converter.step_results_to_auto_test_step_result_update_request(
+                    test_result.get_setup_results())
+            model.teardown_results = Converter.step_results_to_auto_test_step_result_update_request(
+                    test_result.get_teardown_results())
 
             try:
                 self.__test_results_api.api_v2_test_results_id_put(
@@ -211,14 +207,16 @@ class ApiClientWorker:
 
         for path in attach_paths:
             if os.path.isfile(path):
-                try:
-                    attachment_response = self.__attachments_api.api_v2_attachments_post(file=open(path, "rb"))
+                with open(path, "rb+") as file:
+                    try:
+                        attachment_response = self.__attachments_api.api_v2_attachments_post(
+                            file=(file.name, file.read()))
 
-                    attachments.append(AttachmentPutModel(attachment_response['id']))
+                        attachments.append(AttachmentPutModel(id=attachment_response.id))
 
-                    logging.debug(f'Attachment "{path}" was uploaded')
-                except Exception as exc:
-                    logging.error(f'Upload attachment "{path}" status: {exc}')
+                        logging.debug(f'Attachment "{path}" was uploaded')
+                    except Exception as exc:
+                        logging.error(f'Upload attachment "{path}" status: {exc}')
             else:
                 logging.error(f'File "{path}" was not found!')
         return attachments

{testit_python_commons-3.3.0 → testit_python_commons-3.3.2}/src/testit_python_commons/client/converter.py

@@ -2,6 +2,7 @@ import typing
 
 from testit_api_client.models import (
     AttachmentPutModelAutoTestStepResultsModel,
+    AutoTestStepResultUpdateRequest,
     AutoTestPostModel,
     AutoTestPutModel,
     AutoTestResultsForTestRunModel,
@@ -11,11 +12,13 @@ from testit_api_client.models import (
     LinkPutModel,
     LinkType,
     TestRunV2PostShortModel,
-    AutotestsSelectModelFilter,
-    AutotestsSelectModelIncludes,
-    ApiV2AutoTestsSearchPostRequest,
+    TestRunV2GetModel,
+    AutotestFilterModel,
+    SearchAutoTestsQueryIncludesModel,
+    AutotestsSelectModel,
     TestResultUpdateV2Request,
     TestResultModel,
+    TestResultV2GetModel,
     AttachmentModel,
     AttachmentUpdateRequest
 )
@@ -38,38 +41,38 @@ class Converter:
 
     @classmethod
     @adapter_logger
-    def get_id_from_create_test_run_response(cls, response):
-        return response['id']
+    def get_id_from_create_test_run_response(cls, response: TestRunV2GetModel):
+        return response.id
 
     @classmethod
     @adapter_logger
-    def get_resolved_autotests_from_get_test_run_response(cls, response, configuration: str):
-        autotests = response['_data_store']['test_results']
+    def get_resolved_autotests_from_get_test_run_response(cls, response: TestRunV2GetModel, configuration: str):
+        autotests = response.test_results
 
         return cls.__get_resolved_autotests(autotests, configuration)
 
     @classmethod
     @adapter_logger
     def project_id_and_external_id_to_auto_tests_search_post_request(cls, project_id: str, external_id: str):
-        autotests_filter = AutotestsSelectModelFilter(
+        autotests_filter = AutotestFilterModel(
             project_ids=[project_id],
             external_ids=[external_id],
             is_deleted=False)
-        autotests_includes = AutotestsSelectModelIncludes(
+        autotests_includes = SearchAutoTestsQueryIncludesModel(
             include_steps=False,
             include_links=False,
             include_labels=False)
 
-        return ApiV2AutoTestsSearchPostRequest(filter=autotests_filter, includes=autotests_includes)
+        return AutotestsSelectModel(filter=autotests_filter, includes=autotests_includes)
 
     @staticmethod
     @adapter_logger
-    def __get_resolved_autotests(autotests: list, configuration: str):
+    def __get_resolved_autotests(autotests: typing.List[TestResultV2GetModel], configuration: str):
         resolved_autotests = []
 
         for autotest in autotests:
-            if configuration == autotest['_data_store']['configuration_id']:
-                resolved_autotests.append(autotest._data_store['auto_test']._data_store['external_id'])
+            if configuration == autotest.configuration_id:
+                resolved_autotests.append(autotest.auto_test.external_id)
 
         return resolved_autotests
 
@@ -95,7 +98,8 @@ class Converter:
             description=test_result.get_description(),
             links=cls.links_to_links_post_model(test_result.get_links()),
             labels=test_result.get_labels(),
-            should_create_work_item=test_result.get_automatic_creation_test_cases()
+            should_create_work_item=test_result.get_automatic_creation_test_cases(),
+            external_key=test_result.get_external_key()
         )
 
     @classmethod
@@ -120,7 +124,8 @@ class Converter:
                 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()
+                labels=test_result.get_labels(),
+                external_key=test_result.get_external_key()
             )
         else:
             return AutoTestPutModel(
@@ -138,7 +143,8 @@ class Converter:
                 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()
+                labels=test_result.get_labels(),
+                external_key=test_result.get_external_key()
             )
 
     @classmethod
@@ -324,3 +330,27 @@ class Converter:
             )
 
         return autotest_model_step_results
+
+    @classmethod
+    @adapter_logger
+    def step_results_to_auto_test_step_result_update_request(
+            cls, step_results: typing.List[StepResult]) -> typing.List[AutoTestStepResultUpdateRequest]:
+        autotest_model_step_results = []
+
+        for step_result in step_results:
+            autotest_model_step_results.append(
+                AutoTestStepResultUpdateRequest(
+                    title=step_result.get_title(),
+                    outcome=AvailableTestResultOutcome(step_result.get_outcome()),
+                    description=step_result.get_description(),
+                    duration=step_result.get_duration(),
+                    parameters=step_result.get_parameters(),
+                    attachments=step_result.get_attachments(),
+                    started_on=step_result.get_started_on(),
+                    completed_on=step_result.get_completed_on(),
+                    step_results=cls.step_results_to_auto_test_step_result_update_request(
+                        step_result.get_step_results())
+                )
+            )
+
+        return autotest_model_step_results

{testit_python_commons-3.3.0 → testit_python_commons-3.3.2}/src/testit_python_commons/models/test_result.py

@@ -29,6 +29,7 @@ class TestResult:
     __parameters: dict = {}
     __properties: dict = {}
     __automatic_creation_test_cases: bool = False
+    __external_key: str = None
 
     @adapter_logger
     def set_external_id(self, external_id: str):
@@ -259,3 +260,13 @@ class TestResult:
     @adapter_logger
     def get_automatic_creation_test_cases(self) -> bool:
         return self.__automatic_creation_test_cases
+
+    @adapter_logger
+    def set_external_key(self, external_key: str):
+        self.__external_key = external_key
+
+        return self
+
+    @adapter_logger
+    def get_external_key(self) -> str:
+        return self.__external_key

{testit_python_commons-3.3.0 → testit_python_commons-3.3.2}/src/testit_python_commons.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: testit-python-commons
-Version: 3.3.0
+Version: 3.3.2
 Summary: Python commons for Test IT
 Home-page: https://github.com/testit-tms/adapters-python/
 Author: Integration team
@@ -16,7 +16,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Description-Content-Type: text/markdown
 Requires-Dist: pluggy
-Requires-Dist: testit-api-client==4.2.0
+Requires-Dist: testit-api-client==5.0.0
 
 # How to enable debug logging?
 1. Add in **connection_config.ini** file from the root directory of the project:

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

@@ -0,0 +1,2 @@
+pluggy
+testit-api-client==5.0.0

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

@@ -1,2 +0,0 @@
-pluggy
-testit-api-client==4.2.0