testit-python-commons 3.6.7.post540__tar.gz → 3.7.0.post530__tar.gz

{testit_python_commons-3.6.7.post540 → testit_python_commons-3.7.0.post530}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: testit-python-commons
-Version: 3.6.7.post540
+Version: 3.7.0.post530
 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==6.3.1.post540
+Requires-Dist: testit-api-client==7.0.0.post530
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{testit_python_commons-3.6.7.post540 → testit_python_commons-3.7.0.post530}/setup.py

@@ -1,6 +1,6 @@
 from setuptools import find_packages, setup
 
-VERSION = "3.6.7.post540"
+VERSION = "3.7.0.post530"
 
 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==6.3.1.post540']
+    install_requires=['pluggy', 'tomli', 'testit-api-client==7.0.0.post530']
 )

{testit_python_commons-3.6.7.post540 → testit_python_commons-3.7.0.post530}/src/testit_python_commons/client/api_client.py

@@ -4,7 +4,7 @@ import typing
 from datetime import datetime
 
 from testit_api_client import ApiClient, Configuration
-from testit_api_client.api import AttachmentsApi, AutoTestsApi, TestRunsApi, TestResultsApi, WorkItemsApi
+from testit_api_client.apis import AttachmentsApi, AutoTestsApi, TestRunsApi, TestResultsApi, WorkItemsApi
 from testit_api_client.models import (
     AutoTestApiResult,
     AutoTestPostModel,
@@ -73,7 +73,7 @@ class ApiClientWorker:
         )
         model = self._escape_html_in_model(model)
 
-        response = self.__test_run_api.create_empty(create_empty_test_run_api_model=model)
+        response = self.__test_run_api.create_empty(create_empty_request=model)
 
         return Converter.get_id_from_create_test_run_response(response)
 
@@ -95,7 +95,7 @@ class ApiClientWorker:
             self.__config.get_project_id(),
             test_result.get_external_id())
 
-        autotests = self.__autotest_api.api_v2_auto_tests_search_post(auto_test_search_api_model=model)
+        autotests = self.__autotest_api.api_v2_auto_tests_search_post(api_v2_auto_tests_search_post_request=model)
 
         if autotests:
             self.__update_test(test_result, autotests[0])
@@ -122,10 +122,10 @@ class ApiClientWorker:
                 test_result,
                 self.__config.get_configuration_id())
 
-            autotests = self.__autotest_api.api_v2_auto_tests_search_post(auto_test_search_api_model=model)
+            autotests = self.__autotest_api.api_v2_auto_tests_search_post(api_v2_auto_tests_search_post_request=model)
 
             if autotests:
-                autotest_for_update = self.__prepare_to_update_autotest(test_result, autotests[0])
+                autotest_for_update = self.__prepare_to_mass_update_autotest(test_result, autotests[0])
 
                 autotests_for_update.append(autotest_for_update)
                 results_for_autotests_being_updated.append(test_result_model)
@@ -137,7 +137,7 @@ class ApiClientWorker:
                     autotests_for_update.clear()
                     results_for_autotests_being_updated.clear()
             else:
-                autotest_for_create = self.__prepare_to_create_autotest(test_result)
+                autotest_for_create = self.__prepare_to_mass_create_autotest(test_result)
 
                 autotests_for_create.append(autotest_for_create)
                 results_for_autotests_being_created.append(test_result_model)
@@ -167,6 +167,18 @@ class ApiClientWorker:
     def __prepare_to_create_autotest(self, test_result: TestResult) -> AutoTestPostModel:
         logging.debug('Preparing to create the auto test ' + test_result.get_external_id())
 
+        model = Converter.test_result_to_create_autotest_request(
+            test_result,
+            self.__config.get_project_id())
+        model.work_item_ids_for_link_with_auto_test = self.__get_work_item_uuids_for_link_with_auto_test(
+            test_result.get_work_item_ids())
+
+        return model
+
+    @adapter_logger
+    def __prepare_to_mass_create_autotest(self, test_result: TestResult) -> AutoTestPostModel:
+        logging.debug('Preparing to create the auto test ' + test_result.get_external_id())
+
         model = Converter.test_result_to_autotest_post_model(
             test_result,
             self.__config.get_project_id())
@@ -182,6 +194,23 @@ class ApiClientWorker:
             autotest: AutoTestApiResult) -> AutoTestPutModel:
         logging.debug('Preparing to update the auto test ' + test_result.get_external_id())
 
+        model = Converter.test_result_to_update_autotest_request(
+            test_result,
+            self.__config.get_project_id())
+        model.is_flaky = autotest.is_flaky
+        model.work_item_ids_for_link_with_auto_test = self.__get_work_item_uuids_for_link_with_auto_test(
+            test_result.get_work_item_ids(),
+            str(autotest.global_id))
+
+        return model
+
+    @adapter_logger
+    def __prepare_to_mass_update_autotest(
+            self,
+            test_result: TestResult,
+            autotest: AutoTestApiResult) -> AutoTestPutModel:
+        logging.debug('Preparing to update the auto test ' + test_result.get_external_id())
+
         model = Converter.test_result_to_autotest_put_model(
             test_result,
             self.__config.get_project_id())
@@ -297,7 +326,7 @@ class ApiClientWorker:
         model = self.__prepare_to_create_autotest(test_result)
         model = self._escape_html_in_model(model)
 
-        autotest_response = self.__autotest_api.create_auto_test(auto_test_post_model=model)
+        autotest_response = self.__autotest_api.create_auto_test(create_auto_test_request=model)
 
         logging.debug(f'Autotest "{test_result.get_autotest_name()}" was created')
 
@@ -319,7 +348,7 @@ class ApiClientWorker:
         model = self.__prepare_to_update_autotest(test_result, autotest)
         model = self._escape_html_in_model(model)
 
-        self.__autotest_api.update_auto_test(auto_test_put_model=model)
+        self.__autotest_api.update_auto_test(update_auto_test_request=model)
 
         logging.debug(f'Autotest "{test_result.get_autotest_name()}" was updated')
 
@@ -398,7 +427,7 @@ class ApiClientWorker:
             try:
                 self.__test_results_api.api_v2_test_results_id_put(
                     id=test_result.get_test_result_id(),
-                    test_result_update_v2_request=model)
+                    api_v2_test_results_id_put_request=model)
             except Exception as exc:
                 logging.error(f'Cannot update test result with id "{test_result.get_test_result_id()}" status: {exc}')
 
@@ -409,12 +438,9 @@ class ApiClientWorker:
         for path in attach_paths:
             if os.path.isfile(path):
                 try:
-                    attachment_response = self.__attachments_api.api_v2_attachments_post(
-                        file=path)
+                    attachment_response = self.__attachments_api.api_v2_attachments_post(file=open(path, "rb"))
 
-                    attachment_model = AttachmentPutModel(id=attachment_response.id)
-                    attachment_model = self._escape_html_in_model(attachment_model)
-                    attachments.append(attachment_model)
+                    attachments.append(AttachmentPutModel(attachment_response['id']))
 
                     logging.debug(f'Attachment "{path}" was uploaded')
                 except Exception as exc:

{testit_python_commons-3.6.7.post540 → testit_python_commons-3.7.0.post530}/src/testit_python_commons/client/converter.py

@@ -3,6 +3,8 @@ import typing
 from testit_api_client.models import (
     AttachmentPutModelAutoTestStepResultsModel,
     AutoTestStepResultUpdateRequest,
+    CreateAutoTestRequest,
+    UpdateAutoTestRequest,
     AutoTestPostModel,
     AutoTestPutModel,
     AutoTestResultsForTestRunModel,
@@ -11,12 +13,12 @@ from testit_api_client.models import (
     LinkPostModel,
     LinkPutModel,
     LinkType,
-    CreateEmptyTestRunApiModel,
+    CreateEmptyRequest,
     TestRunV2ApiResult,
-    AutoTestFilterApiModel,
-    AutoTestSearchIncludeApiModel,
-    AutoTestSearchApiModel,
-    TestResultUpdateV2Request,
+    AutoTestSearchApiModelFilter,
+    AutoTestSearchApiModelIncludes,
+    ApiV2AutoTestsSearchPostRequest,
+    ApiV2TestResultsIdPutRequest,
     TestResultResponse,
     TestResultV2GetModel,
     AttachmentApiResult,
@@ -34,7 +36,7 @@ class Converter:
     @classmethod
     @adapter_logger
     def test_run_to_test_run_short_model(cls, project_id, name):
-        return CreateEmptyTestRunApiModel(
+        return CreateEmptyRequest(
             project_id=project_id,
             name=name
         )
@@ -54,16 +56,16 @@ class Converter:
     @classmethod
     @adapter_logger
     def project_id_and_external_id_to_auto_tests_search_post_request(cls, project_id: str, external_id: str):
-        autotests_filter = AutoTestFilterApiModel(
+        autotests_filter = AutoTestSearchApiModelFilter(
             project_ids=[project_id],
             external_ids=[external_id],
             is_deleted=False)
-        autotests_includes = AutoTestSearchIncludeApiModel(
+        autotests_includes = AutoTestSearchApiModelIncludes(
             include_steps=False,
             include_links=False,
             include_labels=False)
 
-        return AutoTestSearchApiModel(filter=autotests_filter, includes=autotests_includes)
+        return ApiV2AutoTestsSearchPostRequest(filter=autotests_filter, includes=autotests_includes)
 
     @staticmethod
     @adapter_logger
@@ -102,6 +104,32 @@ class Converter:
             external_key=test_result.get_external_key()
         )
 
+    @classmethod
+    @adapter_logger
+    def test_result_to_create_autotest_request(
+            cls,
+            test_result: TestResult,
+            project_id: str):
+        return CreateAutoTestRequest(
+            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_post_model(test_result.get_links()),
+            labels=test_result.get_labels(),
+            should_create_work_item=test_result.get_automatic_creation_test_cases(),
+            external_key=test_result.get_external_key()
+        )
+
     @classmethod
     @adapter_logger
     def test_result_to_autotest_put_model(
@@ -147,6 +175,51 @@ class Converter:
                 external_key=test_result.get_external_key()
             )
 
+    @classmethod
+    @adapter_logger
+    def test_result_to_update_autotest_request(
+            cls,
+            test_result: TestResult,
+            project_id: str):
+        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(),
+                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(),
+                external_key=test_result.get_external_key()
+            )
+
     @classmethod
     @adapter_logger
     def test_result_to_testrun_result_post_model(
@@ -179,8 +252,8 @@ class Converter:
     @adapter_logger
     def convert_test_result_model_to_test_results_id_put_request(
             cls,
-            test_result: TestResultResponse) -> TestResultUpdateV2Request:
-        return TestResultUpdateV2Request(
+            test_result: TestResultResponse) -> ApiV2TestResultsIdPutRequest:
+        return ApiV2TestResultsIdPutRequest(
             failure_class_ids=test_result.failure_class_ids,
             outcome=test_result.outcome,
             comment=test_result.comment,
@@ -198,8 +271,8 @@ class Converter:
     @adapter_logger
     def convert_test_result_with_all_setup_and_teardown_steps_to_test_results_id_put_request(
             cls,
-            test_result: TestResultWithAllFixtureStepResults) -> TestResultUpdateV2Request:
-        return TestResultUpdateV2Request(
+            test_result: TestResultWithAllFixtureStepResults) -> ApiV2TestResultsIdPutRequest:
+        return ApiV2TestResultsIdPutRequest(
             setup_results=cls.step_results_to_attachment_put_model_autotest_step_results_model(
                 test_result.get_setup_results()),
             teardown_results=cls.step_results_to_attachment_put_model_autotest_step_results_model(

{testit_python_commons-3.6.7.post540 → testit_python_commons-3.7.0.post530}/src/testit_python_commons.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: testit-python-commons
-Version: 3.6.7.post540
+Version: 3.7.0.post530
 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==6.3.1.post540
+Requires-Dist: testit-api-client==7.0.0.post530
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

testit_python_commons-3.7.0.post530/src/testit_python_commons.egg-info/requires.txt

@@ -0,0 +1,3 @@
+pluggy
+tomli
+testit-api-client==7.0.0.post530

testit_python_commons-3.6.7.post540/src/testit_python_commons.egg-info/requires.txt

@@ -1,3 +0,0 @@
-pluggy
-tomli
-testit-api-client==6.3.1.post540