testit-python-commons 5.0.0__py3-none-any.whl → 5.1.0__py3-none-any.whl

testit_python_commons/client/api_client.py

@@ -481,9 +481,99 @@ 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):
+        if not external_id:
+            return None
+
+        matches = []
+        for item in self.__get_test_results():
+            if item is None:
+                continue
+            if getattr(item, "autotest_external_id", None) == external_id:
+                matches.append(item)
+
+        if not matches:
+            return None
+
+        orphan_id = None
+        for item in matches:
+            result_id = getattr(item, "id", None)
+            if result_id is None:
+                continue
+            result_id_str = str(result_id)
+            if self.__has_valid_test_point_id_v2(result_id_str):
+                return result_id_str
+            if orphan_id is None:
+                orphan_id = result_id_str
+        return orphan_id
+
+    def __has_valid_test_point_id_v2(self, test_result_id: str) -> bool:
+        """Hack: adapters OpenAPI omits testPointId — read GET /api/v2/testResults/{id}."""
+        import requests
+
+        base = (self.__config.get_url() or "").rstrip("/")
+        url = f"{base}/api/v2/testResults/{test_result_id}"
+        try:
+            response = requests.get(
+                url,
+                headers={
+                    "Accept": "application/json",
+                    "Authorization": f"PrivateToken {self.__config.get_private_token()}",
+                },
+                timeout=10,
+                verify=self.__config.get_cert_validation(),
+            )
+            if response.status_code < 200 or response.status_code >= 300:
+                logging.debug(
+                    "v2 getTestResult %s HTTP %s", test_result_id, response.status_code
+                )
+                return False
+            payload = response.json()
+            test_point_id = payload.get("testPointId")
+            if test_point_id is None:
+                return False
+            value = str(test_point_id)
+            return bool(value) and value != "00000000-0000-0000-0000-000000000000"
+        except Exception as exc:
+            logging.debug("v2 getTestResult %s failed: %s", test_result_id, exc)
+            return False
+
+    @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())
+        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(),

testit_python_commons/services/adapter_manager.py

@@ -18,7 +18,6 @@ from testit_python_commons.services.sync_storage.sync_storage_runner import (
 )
 
 SYNC_STORAGE_AVAILABLE = True
-IN_PROGRESS_LITERAL = "InProgress"
 
 
 class AdapterManager:
@@ -187,9 +186,12 @@ class AdapterManager:
         self.__sync_storage_runner.set_is_already_in_progress(True)
 
         try:
-            # Write test result normally (mark as IN PROGRESS in Test IT)
-            logging.debug("Write internally, change status to in progress")
-            test_result.set_outcome(IN_PROGRESS_LITERAL)
+            # Keep final outcome. Prefer PUT on existing TP-bound InProgress (mode=0);
+            # never invent a second InProgress via setAutoTestResultsForTestRun.
+            logging.debug(
+                "SyncStorage accepted %s; write final status (update existing if present)",
+                test_result.get_external_id(),
+            )
             self._write_test_realtime_internal(test_result)
             return True
         except Exception as e:

testit_python_commons/services/sync_storage/sync_storage_runner.py

@@ -40,7 +40,7 @@ class SyncStorageRunner:
     across multiple workers.
     """
 
-    SYNC_STORAGE_VERSION = "v0.3.7-tms-5.7"
+    SYNC_STORAGE_VERSION = "v0.3.8-rc-tms-5.7"
     SYNC_STORAGE_REPO_URL = (
         "https://github.com/testit-tms/sync-storage-public/releases/download/"
     )

{testit_python_commons-5.0.0.dist-info → testit_python_commons-5.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: testit-python-commons
-Version: 5.0.0
+Version: 5.1.0
 Summary: Python commons for Test IT
 Home-page: https://github.com/testit-tms/adapters-python/
 Author: Integration team

{testit_python_commons-5.0.0.dist-info → testit_python_commons-5.1.0.dist-info}/RECORD

@@ -211,7 +211,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=WurOr4cp6csmQq30cuzDpmsKGSgU2-n3ppKZkcVbZdQ,22546
+testit_python_commons/client/api_client.py,sha256=MQIqTE4VyBTugkpAP7wb3Kr27_2KfSHAIr9th4lcSTs,26025
 testit_python_commons/client/client_configuration.py,sha256=1M-OrROU3Xj0YGsUX4venG-l6Ewr43LNvUcyFfY57ys,2776
 testit_python_commons/client/converter.py,sha256=rVleh2OC2rKd3iR-BVO1-StP9kVqRSsNcp_HcPoNr2E,24653
 testit_python_commons/client/helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -233,7 +233,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=imAogzM7IVv1970lyz3sQXbPvxzVF6nWeKXu4NWVMKE,11435
+testit_python_commons/services/adapter_manager.py,sha256=CtzPoTjGHKKCrjMWk_HEpF26Ww56OI6mwcsRXrTpx2Q,11541
 testit_python_commons/services/adapter_manager_configuration.py,sha256=KyLhB_iNUQaVEurfLQ0RANIZfhJPB19c_WUkGpqf0xo,1619
 testit_python_commons/services/fixture_manager.py,sha256=PCSLBEPa3yJVbCPsMt_Y5badWLAhKrJsZTaUesq7oNI,2006
 testit_python_commons/services/fixture_storage.py,sha256=nAIW0p9lVvVWtiVdFNqaD7-gCBislY8DLrfdlh8OqFw,1205
@@ -244,10 +244,10 @@ testit_python_commons/services/step_manager.py,sha256=pKTtEgpwOS_KJV_9kcBmKA8WRJ
 testit_python_commons/services/step_result_storage.py,sha256=4axfi2dnP3LABlEql9k6lydftOgDFV3c2cXN-1uEvXU,633
 testit_python_commons/services/utils.py,sha256=5LBymIxEC1AKtGQz-S1-ipo3OYR-JzRUAC4WWFQylHc,4060
 testit_python_commons/services/sync_storage/__init__.py,sha256=Qmjs6Xk5l-i5FFItk0-XPrlVK_HkDuX6FD8FID1iKu0,154
-testit_python_commons/services/sync_storage/sync_storage_runner.py,sha256=93OXrGlGKik9359j8novwtG_hud8VL_Ksznts8sRdjE,20546
+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.0.0.dist-info/METADATA,sha256=kzagJEhwz9gub_JiMUnA6fwDWcv3ojRF__aTCLSfw5c,1675
-testit_python_commons-5.0.0.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
-testit_python_commons-5.0.0.dist-info/top_level.txt,sha256=Jme7mbm0CtX-96d3cUiEonamIeb7kAo3Je4bSlxBndI,72
-testit_python_commons-5.0.0.dist-info/RECORD,,
+testit_python_commons-5.1.0.dist-info/METADATA,sha256=xxhtb3Ug-X3Xfu-CjyZ2EwK7_uOkpSwXXWFcN2uJcUI,1675
+testit_python_commons-5.1.0.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
+testit_python_commons-5.1.0.dist-info/top_level.txt,sha256=Jme7mbm0CtX-96d3cUiEonamIeb7kAo3Je4bSlxBndI,72
+testit_python_commons-5.1.0.dist-info/RECORD,,