qase-python-commons: fixed problem with rewrite fields

If a test has qase ID then we skip fields like title, description, etc. If a test doesn't have qase ID then we assign fields like title, description, etc.
qase-tms · Apr 16, 2024 · 44d19a5 · 44d19a5
1 parent a839088
commit 44d19a5
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 17 deletions.
diff --git a/qase-python-commons/pyproject.toml b/qase-python-commons/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "qase-python-commons"
-version = "2.0.11"
+version = "2.0.12"
 description = "A library for Qase TestOps and Qase Report"
 readme = "README.md"
 authors = [{name = "Qase Team", email = "[email protected]"}]

diff --git a/qase-python-commons/src/qaseio/commons/testops.py b/qase-python-commons/src/qaseio/commons/testops.py
@@ -138,7 +138,7 @@ def _send_bulk_results(self):
                 if result.get_suite_title():
                     case_data["suite_title"] = "\t".join(result.get_suite_title().split("."))
 
-                results.append({
+                result_model = {
                     "case_id": result.get_testops_id(),
                     "status": result.execution.status,
                     "stacktrace": result.execution.stacktrace,
@@ -149,7 +149,17 @@ def _send_bulk_results(self):
                     "steps": steps,
                     "param": result.params,
                     "defect": self.defect
-                })
+                }
+
+                testops_id = result.get_testops_id()
+                if testops_id is None:
+                    result_model["case"] = case_data
+                    result_model["case_id"] = None
+                else:
+                    result_model["case"] = None
+                    result_model["case_id"] = testops_id
+
+                results.append(result_model)
 
             api_results = ResultsApi(self.client)
             print(
@@ -335,24 +345,32 @@ def _send_result(self, result: Result):
             if result.get_suite_title():
                 case_data["suite_title"] = "\t".join(result.get_suite_title().split("."))
 
+            result_model = ResultCreate(
+                status=result.execution.status,
+                stacktrace=result.execution.stacktrace,
+                time_ms=result.execution.duration,
+                comment=result.message,
+                attachments=[attach.hash for attach in attached],
+                defect=self.defect,
+                steps=steps,
+                param=result.params
+            )
+
+            testops_id = result.get_testops_id()
+            if testops_id is None:
+                result_model.case = ResultCreateCase(
+                    **{k: v for k, v in case_data.items() if v is not None}
+                )
+                result_model.case_id = None
+            else:
+                result_model.case = None
+                result_model.case_id = testops_id
+
             try:
                 api_results.create_result(
                     code=self.project_code,
                     id=self.run_id,
-                    result_create=ResultCreate(
-                        case_id=result.get_testops_id(),
-                        status=result.execution.status,
-                        stacktrace=result.execution.stacktrace,
-                        time_ms=result.execution.duration,
-                        comment=result.message,
-                        attachments=[attach.hash for attach in attached],
-                        defect=self.defect,
-                        case=ResultCreateCase(
-                            **{k: v for k, v in case_data.items() if v is not None}
-                        ),
-                        steps=steps,
-                        param=result.params
-                    )
+                    result_create=result_model
                 )
                 print(f"[Qase] Results of run {self.run_id} was sent")
             except Exception as e: