testit-python-commons 5.1.4__py3-none-any.whl → 5.1.5__py3-none-any.whl

testit_python_commons/client/api_client.py

@@ -30,7 +30,6 @@ from adapters_api.models import (
 from testit_python_commons.client.client_configuration import ClientConfiguration
 from testit_python_commons.client.converter import Converter
 from testit_python_commons.client.helpers.bulk_autotest_helper import BulkAutotestHelper
-from testit_python_commons.client.helpers.test_result_matching import pick_best_in_progress_id
 from typing import List
 
 from testit_python_commons.models.link import Link
@@ -63,7 +62,6 @@ class ApiClientWorker:
         self.__workflows_api = WorkflowsApi(api_client=api_client)
         self.__config = config
         self.__status_codes = self.__get_status_codes()
-        self.__claimed_in_progress_ids = set()
 
     @staticmethod
     @adapter_logger
@@ -263,15 +261,34 @@ class ApiClientWorker:
 
     @adapter_logger
     @retry
-    def write_tests(self, test_results: List[TestResult], fixture_containers: dict) -> None:
+    def write_tests(
+            self,
+            test_results: List[TestResult],
+            fixture_containers: dict,
+            finalized_external_ids: set = None) -> None:
         logging.debug("call __write_tests")
+        finalized_external_ids = finalized_external_ids or set()
         bulk_autotest_helper = BulkAutotestHelper(self.__autotest_api, self.__test_run_api, self.__config)
         create_count = 0
         update_count = 0
+        skip_count = 0
         tests_to_link_after_create = []
 
         for test_result in test_results:
             test_result = self.__add_fixtures_to_test_result(test_result, fixture_containers)
+            external_id = test_result.get_external_id()
+
+            if external_id in finalized_external_ids:
+                skip_count += 1
+                logging.info(
+                    'Bulk import: skip sendTestResults for %s (already finalized at test finish)',
+                    external_id,
+                )
+                autotests = self.__get_autotests_by_external_id(external_id)
+                if autotests:
+                    self.__update_auto_test(test_result, autotests[0])
+                continue
+
             should_create_work_item = test_result.get_automatic_creation_test_cases()
 
             test_result_model = Converter.test_result_to_testrun_result_post_model(
@@ -317,9 +334,10 @@ class ApiClientWorker:
                 tests_to_link_after_create.append(test_result)
 
         logging.info(
-            "Bulk write summary: create=%d, update=%d, total=%d",
+            "Bulk write summary: create=%d, update=%d, skip=%d, total=%d",
             create_count,
             update_count,
+            skip_count,
             len(test_results),
         )
         bulk_autotest_helper.teardown()
@@ -536,87 +554,9 @@ class ApiClientWorker:
 
         logging.debug(f'Autotest was linked with workItem "{work_item_id}" by global id "{autotest_global_id}')
 
-    @adapter_logger
-    def find_in_progress_test_result_id(self, external_id: str, parameters=None):
-        if not external_id:
-            return None
-
-        candidates = []
-        for item in self.__get_test_results():
-            if item is None:
-                continue
-            if getattr(item, "autotest_external_id", None) != external_id:
-                continue
-            result_id = getattr(item, "id", None)
-            if result_id is None:
-                continue
-            result_id_str = str(result_id)
-            if result_id_str in self.__claimed_in_progress_ids:
-                continue
-            try:
-                detail = self.get_test_result_by_id(result_id_str)
-                test_point_id = getattr(detail, "test_point_id", None)
-                parameters_meta = getattr(detail, "parameters", None) or {}
-            except Exception as exc:
-                logging.debug("getTestResult %s failed: %s", result_id_str, exc)
-                test_point_id = None
-                parameters_meta = {}
-            candidates.append({
-                "id": result_id_str,
-                "has_test_point": self.__is_valid_test_point_id(test_point_id),
-                "parameters": parameters_meta,
-            })
-
-        chosen = pick_best_in_progress_id(candidates, parameters)
-        if chosen:
-            self.__claimed_in_progress_ids.add(chosen)
-        return chosen
-
-    @staticmethod
-    def __is_valid_test_point_id(test_point_id) -> bool:
-        if test_point_id is None:
-            return False
-        value = str(test_point_id)
-        return bool(value) and value != "00000000-0000-0000-0000-000000000000"
-
-    @adapter_logger
-    @retry
-    def __update_existing_test_result(self, test_result_id: str, test_result: TestResult) -> str:
-        existing = self.get_test_result_by_id(test_result_id)
-        model = Converter.convert_test_result_model_to_test_results_id_put_request(existing)
-
-        outcome = test_result.get_outcome()
-        if outcome and outcome.upper() in self.__status_codes:
-            model.status_code = outcome
-
-        if test_result.get_duration() is not None:
-            model.duration_in_ms = round(test_result.get_duration())
-        if test_result.get_message() is not None:
-            model.message = test_result.get_message()
-        if test_result.get_traces() is not None:
-            model.trace = test_result.get_traces()
-
-        self.__test_results_api.adapters_test_results_id_put(
-            id=test_result_id,
-            adapters_test_results_id_put_request=model,
-        )
-        logging.debug(
-            'Updated existing test result "%s" for autotest "%s"',
-            test_result_id,
-            test_result.get_autotest_name(),
-        )
-        return test_result_id
-
     @adapter_logger
     @retry
     def __load_test_result(self, test_result: TestResult) -> str:
-        existing_id = self.find_in_progress_test_result_id(
-            test_result.get_external_id(),
-            test_result.get_parameters(),
-        )
-        if existing_id:
-            return self.__update_existing_test_result(existing_id, test_result)
-
         model = Converter.test_result_to_testrun_result_post_model(
             test_result,
             self.__config.get_configuration_id(),
@@ -626,10 +566,19 @@ class ApiClientWorker:
             id=self.__config.get_test_run_id(),
             auto_test_results_for_test_run_model=[model])
 
-        logging.debug(f'Result of the autotest "{test_result.get_autotest_name()}" was set '
-                      f'in the test run "{self.__config.get_test_run_id()}"')
+        test_result_id = Converter.get_test_result_id_from_testrun_result_post_response(response)
+        logging.debug(
+            'Finalized test result via sendTestResults for %s (resultId=%s)',
+            test_result.get_external_id(),
+            test_result_id,
+        )
+        logging.debug(
+            'Result of the autotest "%s" was set in the test run "%s"',
+            test_result.get_autotest_name(),
+            self.__config.get_test_run_id(),
+        )
 
-        return Converter.get_test_result_id_from_testrun_result_post_response(response)
+        return test_result_id
 
     @adapter_logger
     @retry
@@ -638,6 +587,8 @@ class ApiClientWorker:
 
     @adapter_logger
     def update_test_results(self, fixtures_containers: dict, test_result_ids: dict) -> None:
+        # PUT only setup/teardown fixtures — never status or step_results.
+        # See docs/test-result-export-contract.md
         test_results = Converter.fixtures_containers_to_test_results_with_all_fixture_step_results(
             fixtures_containers, test_result_ids)
 

testit_python_commons/services/adapter_manager.py

@@ -189,10 +189,9 @@ class AdapterManager:
         self.__sync_storage_runner.set_is_already_in_progress(True)
 
         try:
-            # Keep final outcome. Prefer PUT on existing TP-bound InProgress (mode=0);
-            # never invent a second InProgress via setAutoTestResultsForTestRun.
+            # Final status via sendTestResults (create); never change status via PUT.
             logging.debug(
-                "SyncStorage accepted %s; write final status (update existing if present)",
+                "SyncStorage accepted %s; sendTestResults with final status",
                 test_result.get_external_id(),
             )
             self._write_test_realtime_internal(test_result)
@@ -263,7 +262,11 @@ class AdapterManager:
         for test_result in self.__test_results:
             test_result.set_automatic_creation_test_cases(should_create_work_item)
 
-        self.__api_client.write_tests(self.__test_results, fixtures)
+        self.__api_client.write_tests(
+            self.__test_results,
+            fixtures,
+            finalized_external_ids=set(self.__test_result_map.keys()),
+        )
 
     @adapter_logger
     def load_attachments(self, attach_paths):

{testit_python_commons-5.1.4.dist-info → testit_python_commons-5.1.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: testit-python-commons
-Version: 5.1.4
+Version: 5.1.5
 Summary: Python commons for Test IT
 Home-page: https://github.com/testit-tms/adapters-python/
 Author: Integration team
@@ -33,7 +33,9 @@ Dynamic: summary
 
 This library includes built-in support for Sync Storage, enabling coordinated test execution across multiple workers in distributed testing environments.
 
-See [SYNC_STORAGE_INTEGRATION.md](SYNC_STORAGE_INTEGRATION.md) for detailed documentation on how the integration works.
+See [sync-storage-interaction-spec.md](sync-storage-interaction-spec.md) for the protocol.
+
+**Test result export (POST vs PUT):** [../docs/test-result-export-contract.md](../docs/test-result-export-contract.md)
 
 # How to enable debug logging?
 1. Add in **connection_config.ini** file from the root directory of the project:

{testit_python_commons-5.1.4.dist-info → testit_python_commons-5.1.5.dist-info}/RECORD

@@ -227,7 +227,7 @@ testit_python_commons/decorators.py,sha256=QI8qMjDincTRZmcZByP5y5wHsf_Fwd1oc67Wu
 testit_python_commons/dynamic_methods.py,sha256=WKHHA6Uj61tWXI3DphALYOi2BV6TnQKvQy0-Vt2JR2I,8816
 testit_python_commons/step.py,sha256=CYUs_S8opmRg1tsTY1dVJOPzzt-HYR3_uLTBpYtHSfQ,3244
 testit_python_commons/client/__init__.py,sha256=zSJhxDHzWWTFHJ0s8bqCaBtM5FK2GcPgZxaKdI8zf-o,165
-testit_python_commons/client/api_client.py,sha256=FX3wnTZGNsMbTA0_79k_4kkm10ezYsdtvJ1Q7BoAcEI,27359
+testit_python_commons/client/api_client.py,sha256=SgIPi9AG8o5jAATggZeiUvK7Hffuir_Z7727AJT3OEs,25274
 testit_python_commons/client/client_configuration.py,sha256=1M-OrROU3Xj0YGsUX4venG-l6Ewr43LNvUcyFfY57ys,2776
 testit_python_commons/client/converter.py,sha256=eZ0GR6DaAdrQeTzKpzGYLPEcGbkc7lTwiVwKGn6cPxE,26998
 testit_python_commons/client/helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -250,7 +250,7 @@ testit_python_commons/models/step_result.py,sha256=T9BbcPB6BCz3ZkrWXy2Z2Guj2wecv
 testit_python_commons/models/test_result.py,sha256=z6OB3V_whCQDJvr4jQdgVanoJSoeKh8ZXgPAACkNrdw,7515
 testit_python_commons/models/test_result_with_all_fixture_step_results_model.py,sha256=aI5nfJ_4EAhzZg7eIV1JhSf9i3EENiRiuQuqJvSUs3M,866
 testit_python_commons/services/__init__.py,sha256=yVVmiCgMyike_8OoNPiHLNoMqKhCDlWYhvmGW0IRHJM,1197
-testit_python_commons/services/adapter_manager.py,sha256=HiPxT5Ikbpdqe41EO-mmiUXvmDPms6ZRnsTCVdnybuE,11839
+testit_python_commons/services/adapter_manager.py,sha256=UJK0c8aj4X2UI8rFNR2wYtPnHWDOA8c5K0dAQeDOIRU,11849
 testit_python_commons/services/adapter_manager_configuration.py,sha256=ZPgSRUskSh8sJNAtlpOSAXqGWWTdYNsDb3jaiuTFEc8,2228
 testit_python_commons/services/fixture_manager.py,sha256=PCSLBEPa3yJVbCPsMt_Y5badWLAhKrJsZTaUesq7oNI,2006
 testit_python_commons/services/fixture_storage.py,sha256=nAIW0p9lVvVWtiVdFNqaD7-gCBislY8DLrfdlh8OqFw,1205
@@ -265,7 +265,7 @@ testit_python_commons/services/sync_storage/__init__.py,sha256=Qmjs6Xk5l-i5FFItk
 testit_python_commons/services/sync_storage/sync_storage_runner.py,sha256=9FCbMxzGa84I79X7QOjYO_oSiUUu43LhJqPDs_JEEb0,20549
 testit_python_commons/utils/__init__.py,sha256=CUHziylwvFAuKyUM1tCp13ik5Z2Mw-VK8n7c92aVy-I,78
 testit_python_commons/utils/html_escape_utils.py,sha256=wx20lAVrMvhNiQ7bEu_f-SGqDBp85D-EBL2sgTmnJPY,8135
-testit_python_commons-5.1.4.dist-info/METADATA,sha256=k9x4s68LToNIUED1RLgLV2mYUYH6-0JI6N7vDpU1TsM,1675
-testit_python_commons-5.1.4.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-testit_python_commons-5.1.4.dist-info/top_level.txt,sha256=TuyfRneOyFuvNz83bbn-pWaAR1fY7FINrrJRTW9Lyqg,65
-testit_python_commons-5.1.4.dist-info/RECORD,,
+testit_python_commons-5.1.5.dist-info/METADATA,sha256=SwurHeovR4YAEBseTc0FHT0NdiWh3X3bwWXCjVIFL74,1766
+testit_python_commons-5.1.5.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+testit_python_commons-5.1.5.dist-info/top_level.txt,sha256=TuyfRneOyFuvNz83bbn-pWaAR1fY7FINrrJRTW9Lyqg,65
+testit_python_commons-5.1.5.dist-info/RECORD,,