qase-python-commons 3.2.7__tar.gz → 3.3.1__tar.gz

{qase_python_commons-3.2.7 → qase_python_commons-3.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: qase-python-commons
-Version: 3.2.7
+Version: 3.3.1
 Summary: A library for Qase TestOps and Qase Report
 Author-email: Qase Team <support@qase.io>
 Project-URL: Homepage, https://github.com/qase-tms/qase-python/tree/main/qase-python-commons

{qase_python_commons-3.2.7 → qase_python_commons-3.3.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "qase-python-commons"
-version = "3.2.7"
+version = "3.3.1"
 description = "A library for Qase TestOps and Qase Report"
 readme = "README.md"
 authors = [{name = "Qase Team", email = "support@qase.io"}]

{qase_python_commons-3.2.7 → qase_python_commons-3.3.1}/src/qase/commons/client/api_v1_client.py

@@ -1,3 +1,4 @@
+from datetime import datetime, timezone
 from typing import Dict, Union
 
 import certifi
@@ -7,7 +8,7 @@ from qase.api_client_v1.configuration import Configuration
 from .. import Logger
 from .base_api_client import BaseApiClient
 from ..exceptions.reporter import ReporterException
-from ..models import Attachment, Result, Step
+from ..models import Attachment, InternalResult, Step
 from ..models.config.framework import Video, Trace
 from ..models.config.qaseconfig import QaseConfig
 from ..models.step import StepType
@@ -99,7 +100,8 @@ class ApiV1Client(BaseApiClient):
             description=description,
             environment_id=(int(environment_id) if environment_id else None),
             plan_id=(int(plan_id) if plan_id else plan_id),
-            is_autotest=True
+            is_autotest=True,
+            start_time=datetime.now(timezone.utc).strftime("%Y-%m-%d %H:%M:%S")
         )
         self.logger.log_debug(f"Creating test run with parameters: {kwargs}")
         try:
@@ -134,7 +136,7 @@ class ApiV1Client(BaseApiClient):
         )
         self.logger.log_debug(f"Results for run {run_id} sent successfully")
 
-    def _prepare_result(self, project_code: str, result: Result) -> Dict:
+    def _prepare_result(self, project_code: str, result: InternalResult) -> Dict:
         attached = []
         if result.attachments:
             for attachment in result.attachments:

{qase_python_commons-3.2.7 → qase_python_commons-3.3.1}/src/qase/commons/client/api_v2_client.py

@@ -17,7 +17,7 @@ from .api_v1_client import ApiV1Client
 from .. import Logger
 from ..exceptions.reporter import ReporterException
 from ..models.config.framework import Video, Trace
-from ..models import Attachment, Result
+from ..models import Attachment, InternalResult
 from ..models.config.qaseconfig import QaseConfig
 from ..models.step import StepType, Step
 
@@ -53,7 +53,7 @@ class ApiV2Client(ApiV1Client):
                                       create_results_request_v2=CreateResultsRequestV2(results=results_to_send))
         self.logger.log_debug(f"Results for run {run_id} sent successfully")
 
-    def _prepare_result(self, project_code: str, result: Result) -> ResultCreate:
+    def _prepare_result(self, project_code: str, result: InternalResult) -> ResultCreate:
         attached = []
         if result.attachments:
             for attachment in result.attachments:
@@ -78,6 +78,7 @@ class ApiV2Client(ApiV1Client):
             signature=result.signature,
             testops_id=result.get_testops_id(),
             execution=ResultExecution(status=result.execution.status, duration=result.execution.duration,
+                                      start_time=result.execution.start_time, end_time=result.execution.end_time,
                                       stacktrace=result.execution.stacktrace, thread=result.execution.thread),
             fields=ResultCreateFields.from_dict(result.fields),
             attachments=[attach.hash for attach in attached],
@@ -85,7 +86,6 @@ class ApiV2Client(ApiV1Client):
             steps_type=ResultStepsType.CLASSIC,
             params=result.params,
             param_groups=result.param_groups,
-            muted=False,
             message=result.message,
             defect=self.config.testops.defect,
         )
@@ -113,6 +113,8 @@ class ApiV2Client(ApiV1Client):
             prepared_step = {'execution': {}, 'data': {}, 'steps': []}
             prepared_step['execution']['status'] = ResultStepStatus(step.execution.status)
             prepared_step['execution']['duration'] = step.execution.duration
+            prepared_step['execution']['start_time'] = step.execution.start_time
+            prepared_step['execution']['end_time'] = step.execution.end_time
 
             if step.step_type == StepType.TEXT:
                 prepared_step['data']['action'] = step.data.action

{qase_python_commons-3.2.7 → qase_python_commons-3.3.1}/src/qase/commons/models/__init__.py

@@ -1,4 +1,4 @@
-from .result import Result, Field
+from .result import Result, InternalResult, Field
 from .run import Run
 from .attachment import Attachment
 from .relation import Relation
@@ -12,5 +12,6 @@ __all__ = [
     Relation,
     Step,
     Runtime,
-    Field
+    Field,
+    InternalResult
 ]

{qase_python_commons-3.2.7 → qase_python_commons-3.3.1}/src/qase/commons/models/result.py

@@ -1,3 +1,4 @@
+import copy
 import time
 import uuid
 
@@ -65,6 +66,70 @@ class Request(BaseModel):
 
 
 class Result(BaseModel):
+    def __init__(self, title: str, signature: str) -> None:
+        self.id: str = str(uuid.uuid4())
+        self.title: str = title
+        self.signature: str = signature
+        self.run_id: Optional[str] = None
+        self.testops_id: Optional[List[int]] = None
+        self.execution: Type[Execution] = Execution()
+        self.fields: Dict[Type[Field]] = {}
+        self.attachments: List[Attachment] = []
+        self.steps: List[Type[Step]] = []
+        self.params: Optional[dict] = {}
+        self.param_groups: Optional[List[List[str]]] = []
+        self.author: Optional[str] = None
+        self.relations: Type[Relation] = None
+        self.muted: bool = False
+        self.message: Optional[str] = None
+        QaseUtils.get_host_data()
+
+    def add_message(self, message: str) -> None:
+        self.message = message
+
+    def add_field(self, field: Type[Field]) -> None:
+        self.fields[field.name] = field.value
+
+    def add_steps(self, steps: List[Type[Step]]) -> None:
+        self.steps = QaseUtils().build_tree(steps)
+
+    def add_attachment(self, attachment: Attachment) -> None:
+        self.attachments.append(attachment)
+
+    def add_param(self, key: str, value: str) -> None:
+        self.params[key] = value
+
+    def add_param_groups(self, values: List[str]) -> None:
+        self.param_groups.append(values)
+
+    def set_relation(self, relation: Relation) -> None:
+        self.relations = relation
+
+    def get_status(self) -> Optional[str]:
+        return self.execution.status
+
+    def get_id(self) -> str:
+        return self.id
+
+    def get_title(self) -> str:
+        return self.title
+
+    def get_field(self, name: str) -> Optional[Type[Field]]:
+        if name in self.fields:
+            return self.fields[name]
+        return None
+
+    def get_testops_id(self) -> Optional[List[int]]:
+        return self.testops_id
+
+    def get_duration(self) -> int:
+        return self.execution.duration
+
+    def set_run_id(self, run_id: str) -> None:
+        self.run_id = run_id
+
+
+class InternalResult(BaseModel):
     def __init__(self, title: str, signature: str) -> None:
         self.id: str = str(uuid.uuid4())
         self.title: str = title
@@ -126,3 +191,24 @@ class Result(BaseModel):
 
     def set_run_id(self, run_id: str) -> None:
         self.run_id = run_id
+
+    @classmethod
+    def convert_from_result(cls, result: Result, testops_id: Optional[int] = None):
+        int_result = cls(result.title, result.signature)
+
+        int_result.id = result.id
+        int_result.title = result.title
+        int_result.signature = result.signature
+        int_result.run_id = result.run_id
+        int_result.testops_id = testops_id
+        int_result.execution = copy.deepcopy(result.execution)
+        int_result.fields = result.fields
+        int_result.attachments = result.attachments
+        int_result.steps = result.steps
+        int_result.params = result.params
+        int_result.author = result.author
+        int_result.relations = result.relations
+        int_result.muted = result.muted
+        int_result.message = result.message
+
+        return int_result

{qase_python_commons-3.2.7 → qase_python_commons-3.3.1}/src/qase/commons/reporters/core.py

@@ -1,5 +1,3 @@
-import os
-import json
 import time
 
 from ..config import ConfigManager
@@ -8,7 +6,7 @@ from ..logger import Logger
 from .report import QaseReport
 from .testops import QaseTestOps
 
-from ..models import Result, Attachment, Runtime
+from ..models import InternalResult, Result, Attachment, Runtime
 from ..models.config.qaseconfig import Mode
 from typing import Union, List
 
@@ -81,7 +79,21 @@ class QaseCoreReporter:
             try:
                 ts = time.time()
                 self.logger.log_debug(f"Adding result {result}")
-                self.reporter.add_result(result)
+                ids = result.get_testops_id()
+
+                if ids is None:
+                    int_result = InternalResult.convert_from_result(result)
+                    self.reporter.add_result(int_result)
+                else:
+                    first = True
+                    for testops_id in ids:
+                        int_result = InternalResult.convert_from_result(result, testops_id)
+                        if not first:
+                            int_result.execution.duration = 0
+                        else:
+                            first = False
+                        self.reporter.add_result(int_result)
+
                 self.logger.log_debug(f"Result {result.get_title()} added")
                 self.overhead += time.time() - ts
             except Exception as e:
@@ -180,7 +192,7 @@ class QaseCoreReporter:
                     host=self.config.testops.api.host
                 )
                 self._execution_plan = loader.load(self.config.testops.project,
-                                                  int(self.config.testops.plan.id))
+                                                   int(self.config.testops.plan.id))
         except Exception as e:
             self.logger.log('Failed to load test plan from Qase TestOps', 'info')
             self.logger.log(e, 'error')

{qase_python_commons-3.2.7 → qase_python_commons-3.3.1}/src/qase/commons/reporters/report.py

@@ -3,7 +3,7 @@ import os
 import shutil
 import json
 import re
-from ..models import Result, Run, Attachment
+from ..models import InternalResult, Run, Attachment
 from .. import QaseUtils, Logger
 from ..models.config.connection import Format
 from ..models.config.qaseconfig import QaseConfig
@@ -40,7 +40,7 @@ class QaseReport:
     def complete_worker(self):
         pass
 
-    def add_result(self, result: Result):
+    def add_result(self, result: InternalResult):
         result.set_run_id(self.run_id)
         for attachment in result.attachments:
             self._persist_attachment(attachment)
@@ -91,7 +91,7 @@ class QaseReport:
                     self._persist_attachments_in_steps(step.steps)
 
     # Method saves result to a file
-    def _store_result(self, result: Result):
+    def _store_result(self, result: InternalResult):
         self._store_object(result, self.report_path + "/results/", result.id)
 
     def _check_report_path(self):

{qase_python_commons-3.2.7 → qase_python_commons-3.3.1}/src/qase/commons/reporters/testops.py

@@ -6,7 +6,7 @@ from typing import List
 from .. import Logger, ReporterException
 from ..client.api_v1_client import ApiV1Client
 from ..client.base_api_client import BaseApiClient
-from ..models import Result
+from ..models import InternalResult
 from ..models.config.qaseconfig import QaseConfig
 
 DEFAULT_BATCH_SIZE = 200
@@ -129,7 +129,7 @@ class QaseTestOps:
         if len(self.results) > 0:
             self._send_results()
 
-    def add_result(self, result: Result) -> None:
+    def add_result(self, result: InternalResult) -> None:
         if result.get_status() == 'failed':
             self.__show_link(result.testops_id, result.title)
         self.results.append(result)

{qase_python_commons-3.2.7 → qase_python_commons-3.3.1}/src/qase_python_commons.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: qase-python-commons
-Version: 3.2.7
+Version: 3.3.1
 Summary: A library for Qase TestOps and Qase Report
 Author-email: Qase Team <support@qase.io>
 Project-URL: Homepage, https://github.com/qase-tms/qase-python/tree/main/qase-python-commons