testit-python-commons 3.9.1.post540__tar.gz → 3.10.0__tar.gz

{testit_python_commons-3.9.1.post540 → testit_python_commons-3.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: testit-python-commons
-Version: 3.9.1.post540
+Version: 3.10.0
 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.0.1.post540
+Requires-Dist: testit-api-client==7.1.1
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{testit_python_commons-3.9.1.post540 → testit_python_commons-3.10.0}/setup.py

@@ -1,6 +1,6 @@
 from setuptools import find_packages, setup
 
-VERSION = "3.9.1.post540"
+VERSION = "3.10.0"
 
 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.0.1.post540']
+    install_requires=['pluggy', 'tomli', 'testit-api-client==7.1.1']
 )

{testit_python_commons-3.9.1.post540 → testit_python_commons-3.10.0}/src/testit_python_commons/client/api_client.py

@@ -5,12 +5,14 @@ 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.models import (
+    ApiV2TestResultsSearchPostRequest,
     AutoTestApiResult,
     AutoTestPostModel,
     AutoTestPutModel,
     AttachmentPutModel,
-    AutoTestResultsForTestRunModel,
+    ApiV2AutoTestsSearchPostRequest,
     TestResultResponse,
+    TestResultShortResponse,
     LinkAutoTestToWorkItemRequest,
     WorkItemIdentifierModel
 )
@@ -22,11 +24,11 @@ from testit_python_commons.models.test_result import TestResult
 from testit_python_commons.services.logger import adapter_logger
 from testit_python_commons.services.retry import retry
 from testit_python_commons.utils.html_escape_utils import HtmlEscapeUtils
-from typing import List
+from typing import List, Any
 
 
 class ApiClientWorker:
-    __max_tests_for_write = 100
+    __tests_limit = 100
 
     def __init__(self, config: ClientConfiguration):
         api_client_config = self.__get_api_client_configuration(
@@ -60,12 +62,12 @@ class ApiClientWorker:
             header_value='PrivateToken ' + token)
 
     @staticmethod
-    def _escape_html_in_model(model):
+    def _escape_html_in_model(model: Any) -> Any:
         """Apply HTML escaping to all models before sending to API"""
         return HtmlEscapeUtils.escape_html_in_object(model)
 
     @adapter_logger
-    def create_test_run(self):
+    def create_test_run(self) -> str:
         test_run_name = f'TestRun_{datetime.today().strftime("%Y-%m-%dT%H:%M:%S")}' if \
             not self.__config.get_test_run_name() else self.__config.get_test_run_name()
         model = Converter.test_run_to_test_run_short_model(
@@ -79,19 +81,50 @@ class ApiClientWorker:
         return Converter.get_id_from_create_test_run_response(response)
 
     @adapter_logger
-    def set_test_run_id(self, test_run_id: str):
+    def set_test_run_id(self, test_run_id: str) -> None:
         self.__config.set_test_run_id(test_run_id)
 
     @adapter_logger
-    def get_autotests_by_test_run_id(self):
-        response = self.__test_run_api.get_test_run_by_id(self.__config.get_test_run_id())
-
-        return Converter.get_resolved_autotests_from_get_test_run_response(
-            response,
+    def get_external_ids_for_test_run_id(self) -> List[str]:
+        test_results: List[TestResultShortResponse] = self.__get_test_results()
+        external_ids: List[str] = Converter.get_external_ids_from_autotest_response_list(
+            test_results,
             self.__config.get_configuration_id())
 
+        if len(external_ids) > 0:
+            return external_ids
+
+        raise Exception('The autotests with the status "InProgress" ' +
+                        f'and the configuration id "{self.__config.get_configuration_id()}" were not found!')
+
+    def __get_test_results(self) -> List[TestResultShortResponse]:
+        all_test_results = []
+        skip = 0
+        model: ApiV2TestResultsSearchPostRequest = (
+            Converter.build_test_results_search_post_request_with_in_progress_outcome(
+                self.__config.get_test_run_id(),
+                self.__config.get_configuration_id()))
+
+        while skip >= 0:
+            logging.debug(f"Getting test results with limit {self.__tests_limit}: {model}")
+
+            test_results: List[TestResultShortResponse] = self.__test_results_api.api_v2_test_results_search_post(
+                skip=skip,
+                take=self.__tests_limit,
+                api_v2_test_results_search_post_request=model)
+
+            logging.debug(f"Got {len(test_results)} test results: {test_results}")
+
+            all_test_results.extend(test_results)
+            skip += self.__tests_limit
+
+            if len(test_results) == 0:
+                skip = -1
+
+        return all_test_results
+
     @adapter_logger
-    def __get_autotests_by_external_id(self, external_id: str) -> list:
+    def __get_autotests_by_external_id(self, external_id: str) -> List[AutoTestApiResult]:
         model = Converter.project_id_and_external_id_to_auto_tests_search_post_request(
             self.__config.get_project_id(),
             external_id)
@@ -99,7 +132,7 @@ class ApiClientWorker:
         return self.__autotest_api.api_v2_auto_tests_search_post(api_v2_auto_tests_search_post_request=model)
 
     @adapter_logger
-    def write_test(self, test_result: TestResult):
+    def write_test(self, test_result: TestResult) -> str:
         model = Converter.project_id_and_external_id_to_auto_tests_search_post_request(
             self.__config.get_project_id(),
             test_result.get_external_id())
@@ -118,7 +151,7 @@ class ApiClientWorker:
         return self.__load_test_result(test_result)
 
     @adapter_logger
-    def write_tests(self, test_results: List[TestResult], fixture_containers: dict):
+    def write_tests(self, test_results: List[TestResult], fixture_containers: dict) -> None:
         bulk_autotest_helper = BulkAutotestHelper(self.__autotest_api, self.__test_run_api, self.__config)
 
         for test_result in test_results:
@@ -181,8 +214,8 @@ class ApiClientWorker:
     @adapter_logger
     def __get_work_item_uuids_for_link_with_auto_test(
             self,
-            work_item_ids: list,
-            autotest_global_id: str = None) -> list:
+            work_item_ids: List[str],
+            autotest_global_id: str = None) -> List[str]:
         linked_work_items = []
 
         if autotest_global_id:
@@ -195,8 +228,8 @@ class ApiClientWorker:
     @adapter_logger
     def __prepare_list_of_work_item_uuids(
             self,
-            linked_work_items: list,
-            work_item_ids: list) -> list:
+            linked_work_items: List[WorkItemIdentifierModel],
+            work_item_ids: List[str]) -> List[str]:
         work_item_uuids = []
 
         for linked_work_item in linked_work_items:
@@ -275,7 +308,7 @@ class ApiClientWorker:
         return autotest_response.id
 
     @adapter_logger
-    def __create_tests(self, autotests_for_create: List[AutoTestPostModel]):
+    def __create_tests(self, autotests_for_create: List[AutoTestPostModel]) -> None:
         logging.debug(f'Creating autotests: "{autotests_for_create}')
 
         autotests_for_create = self._escape_html_in_model(autotests_for_create)
@@ -284,7 +317,7 @@ class ApiClientWorker:
         logging.debug(f'Autotests were created')
 
     @adapter_logger
-    def __update_test(self, test_result: TestResult, autotest: AutoTestApiResult):
+    def __update_test(self, test_result: TestResult, autotest: AutoTestApiResult) -> None:
         logging.debug(f'Autotest "{test_result.get_autotest_name()}" was found')
 
         model = Converter.prepare_to_update_autotest(test_result, autotest, self.__config.get_project_id())
@@ -298,7 +331,7 @@ class ApiClientWorker:
         logging.debug(f'Autotest "{test_result.get_autotest_name()}" was updated')
 
     @adapter_logger
-    def __update_tests(self, autotests_for_update: List[AutoTestPutModel]):
+    def __update_tests(self, autotests_for_update: List[AutoTestPutModel]) -> None:
         logging.debug(f'Updating autotests: {autotests_for_update}')
 
         autotests_for_update = self._escape_html_in_model(autotests_for_update)
@@ -308,7 +341,7 @@ class ApiClientWorker:
 
     @adapter_logger
     @retry
-    def __unlink_test_to_work_item(self, autotest_global_id: str, work_item_id: str):
+    def __unlink_test_to_work_item(self, autotest_global_id: str, work_item_id: str) -> None:
         self.__autotest_api.delete_auto_test_link_from_work_item(
             id=autotest_global_id,
             work_item_id=work_item_id)
@@ -317,7 +350,7 @@ class ApiClientWorker:
 
     @adapter_logger
     @retry
-    def __link_test_to_work_item(self, autotest_global_id: str, work_item_id: str):
+    def __link_test_to_work_item(self, autotest_global_id: str, work_item_id: str) -> None:
         self.__autotest_api.link_auto_test_to_work_item(
             autotest_global_id,
             link_auto_test_to_work_item_request=LinkAutoTestToWorkItemRequest(id=work_item_id))
@@ -340,21 +373,12 @@ class ApiClientWorker:
 
         return Converter.get_test_result_id_from_testrun_result_post_response(response)
 
-    @adapter_logger
-    def __load_test_results(self, test_results: List[AutoTestResultsForTestRunModel]):
-        logging.debug(f'Loading test results: {test_results}')
-
-        test_results = self._escape_html_in_model(test_results)
-        self.__test_run_api.set_auto_test_results_for_test_run(
-            id=self.__config.get_test_run_id(),
-            auto_test_results_for_test_run_model=test_results)
-
     @adapter_logger
     def get_test_result_by_id(self, test_result_id: str) -> TestResultResponse:
         return self.__test_results_api.api_v2_test_results_id_get(id=test_result_id)
 
     @adapter_logger
-    def update_test_results(self, fixtures_containers: dict, test_result_ids: dict):
+    def update_test_results(self, fixtures_containers: dict, test_result_ids: dict) -> None:
         test_results = Converter.fixtures_containers_to_test_results_with_all_fixture_step_results(
             fixtures_containers, test_result_ids)
 
@@ -377,7 +401,7 @@ class ApiClientWorker:
                 logging.error(f'Cannot update test result with id "{test_result.get_test_result_id()}" status: {exc}')
 
     @adapter_logger
-    def load_attachments(self, attach_paths: list or tuple):
+    def load_attachments(self, attach_paths: list or tuple) -> List[AttachmentPutModel]:
         attachments = []
 
         for path in attach_paths:

{testit_python_commons-3.9.1.post540 → testit_python_commons-3.10.0}/src/testit_python_commons/client/converter.py

@@ -2,6 +2,7 @@ import logging
 from typing import List
 
 from testit_api_client.models import (
+    ApiV2TestResultsSearchPostRequest,
     AutoTestApiResult,
     AttachmentPutModelAutoTestStepResultsModel,
     AutoTestStepResultUpdateRequest,
@@ -17,12 +18,12 @@ from testit_api_client.models import (
     LinkType,
     CreateEmptyRequest,
     TestRunV2ApiResult,
+    TestResultShortResponse,
     AutoTestSearchApiModelFilter,
     AutoTestSearchApiModelIncludes,
     ApiV2AutoTestsSearchPostRequest,
     ApiV2TestResultsIdPutRequest,
     TestResultResponse,
-    TestResultV2GetModel,
     AttachmentApiResult,
     AttachmentUpdateRequest
 )
@@ -35,29 +36,25 @@ from testit_python_commons.services.logger import adapter_logger
 
 
 class Converter:
-    @classmethod
+    @staticmethod
     @adapter_logger
-    def test_run_to_test_run_short_model(cls, project_id, name):
+    def test_run_to_test_run_short_model(project_id: str, name: str) -> CreateEmptyRequest:
         return CreateEmptyRequest(
             project_id=project_id,
             name=name
         )
 
-    @classmethod
+    @staticmethod
     @adapter_logger
-    def get_id_from_create_test_run_response(cls, response: TestRunV2ApiResult):
+    def get_id_from_create_test_run_response(response: TestRunV2ApiResult) -> str:
         return response.id
 
-    @classmethod
-    @adapter_logger
-    def get_resolved_autotests_from_get_test_run_response(cls, response: TestRunV2ApiResult, configuration: str):
-        autotests = response.test_results
-
-        return cls.__get_resolved_autotests(autotests, configuration)
-
-    @classmethod
+    @staticmethod
     @adapter_logger
-    def project_id_and_external_id_to_auto_tests_search_post_request(cls, project_id: str, external_id: str):
+    def project_id_and_external_id_to_auto_tests_search_post_request(
+            project_id: str,
+            external_id: str
+    ) -> ApiV2AutoTestsSearchPostRequest:
         autotests_filter = AutoTestSearchApiModelFilter(
             project_ids=[project_id],
             external_ids=[external_id],
@@ -69,23 +66,46 @@ class Converter:
 
         return ApiV2AutoTestsSearchPostRequest(filter=autotests_filter, includes=autotests_includes)
 
+    @staticmethod
+    def build_test_results_search_post_request_with_in_progress_outcome(
+            testrun_id: str,
+            configuration_id: str) -> ApiV2TestResultsSearchPostRequest:
+        return ApiV2TestResultsSearchPostRequest(
+            test_run_ids=[testrun_id],
+            configuration_ids=[configuration_id],
+            status_codes=["InProgress"])
+
+    @staticmethod
+    def autotest_ids_to_autotests_search_post_request(
+            autotest_ids: List[int]) -> ApiV2AutoTestsSearchPostRequest:
+        autotests_filter = AutoTestSearchApiModelFilter(
+            global_ids=autotest_ids)
+        autotests_includes = AutoTestSearchApiModelIncludes(
+            include_steps=False,
+            include_links=False,
+            include_labels=False)
+
+        return ApiV2AutoTestsSearchPostRequest(filter=autotests_filter, includes=autotests_includes)
+
     @staticmethod
     @adapter_logger
-    def __get_resolved_autotests(autotests: List[TestResultV2GetModel], configuration: str):
-        resolved_autotests = []
+    def get_external_ids_from_autotest_response_list(
+            autotests: List[TestResultShortResponse],
+            configuration: str) -> List[str]:
+        external_ids: List[str] = []
 
         for autotest in autotests:
             if configuration == autotest.configuration_id:
-                resolved_autotests.append(autotest.auto_test.external_id)
+                external_ids.append(autotest.autotest_external_id)
 
-        return resolved_autotests
+        return external_ids
 
     @classmethod
     @adapter_logger
     def test_result_to_autotest_post_model(
             cls,
             test_result: TestResult,
-            project_id: str):
+            project_id: str) -> AutoTestPostModel:
         return AutoTestPostModel(
             external_id=test_result.get_external_id(),
             project_id=project_id,
@@ -111,7 +131,7 @@ class Converter:
     def test_result_to_create_autotest_request(
             cls,
             test_result: TestResult,
-            project_id: str):
+            project_id: str) -> CreateAutoTestRequest:
         return CreateAutoTestRequest(
             external_id=test_result.get_external_id(),
             project_id=project_id,
@@ -137,7 +157,7 @@ class Converter:
     def test_result_to_autotest_put_model(
             cls,
             test_result: TestResult,
-            project_id: str):
+            project_id: str) -> AutoTestPutModel:
         if test_result.get_outcome() == 'Passed':
             return AutoTestPutModel(
                 external_id=test_result.get_external_id(),
@@ -182,7 +202,7 @@ class Converter:
     def test_result_to_update_autotest_request(
             cls,
             test_result: TestResult,
-            project_id: str):
+            project_id: str) -> UpdateAutoTestRequest:
         if test_result.get_outcome() == 'Passed':
             return UpdateAutoTestRequest(
                 external_id=test_result.get_external_id(),
@@ -227,11 +247,11 @@ class Converter:
     def test_result_to_testrun_result_post_model(
             cls,
             test_result: TestResult,
-            configuration_id: str):
+            configuration_id: str) -> AutoTestResultsForTestRunModel:
         return AutoTestResultsForTestRunModel(
             configuration_id=configuration_id,
             auto_test_external_id=test_result.get_external_id(),
-            outcome=AvailableTestResultOutcome(test_result.get_outcome()),
+            status_code=test_result.get_outcome(),
             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(
@@ -257,7 +277,7 @@ class Converter:
             test_result: TestResultResponse) -> ApiV2TestResultsIdPutRequest:
         return ApiV2TestResultsIdPutRequest(
             failure_class_ids=test_result.failure_class_ids,
-            outcome=test_result.outcome,
+            status_code=test_result.status.code,
             comment=test_result.comment,
             links=test_result.links,
             step_results=test_result.step_results,
@@ -459,7 +479,7 @@ class Converter:
             cls,
             test_result: TestResult,
             project_id: str,
-            work_item_ids_for_link_with_auto_test: list) -> AutoTestPostModel:
+            work_item_ids_for_link_with_auto_test: list) -> CreateAutoTestRequest:
         logging.debug('Preparing to create the auto test ' + test_result.get_external_id())
 
         model = cls.test_result_to_create_autotest_request(

{testit_python_commons-3.9.1.post540 → testit_python_commons-3.10.0}/src/testit_python_commons/services/adapter_manager.py

@@ -38,7 +38,7 @@ class AdapterManager:
     @adapter_logger
     def get_autotests_for_launch(self):
         if self.__config.get_mode() == AdapterMode.USE_FILTER:
-            return self.__api_client.get_autotests_by_test_run_id()
+            return self.__api_client.get_external_ids_for_test_run_id()
 
         return
 

{testit_python_commons-3.9.1.post540 → testit_python_commons-3.10.0}/src/testit_python_commons/step.py

@@ -1,4 +1,4 @@
-from datetime import datetime
+from datetime import datetime, UTC
 import logging
 from functools import wraps
 from typing import Any, Callable, TypeVar
@@ -52,7 +52,7 @@ class StepContext:
         self.__parameters = parameters
 
     def __enter__(self):
-        self.__start_time = round(datetime.utcnow().timestamp() * 1000)
+        self.__start_time = round(datetime.now(UTC).timestamp() * 1000)
         self.__step_result = StepResult()
 
         self.__title = Utils.collect_parameters_in_string_attribute(self.__title, self.__parameters)
@@ -74,7 +74,7 @@ class StepContext:
             else TmsPluginManager.get_plugin_manager().hook.get_pytest_check_outcome()[0] if \
             hasattr(TmsPluginManager.get_plugin_manager().hook, 'get_pytest_check_outcome') \
             else 'Passed'
-        duration = round(datetime.utcnow().timestamp() * 1000) - self.__start_time
+        duration = round(datetime.now(UTC).timestamp() * 1000) - self.__start_time
 
         self.__step_result\
             .set_outcome(outcome)\

{testit_python_commons-3.9.1.post540 → testit_python_commons-3.10.0}/src/testit_python_commons.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: testit-python-commons
-Version: 3.9.1.post540
+Version: 3.10.0
 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.0.1.post540
+Requires-Dist: testit-api-client==7.1.1
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

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

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

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

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