robotframework-robotlog2db 1.3.8__tar.gz → 1.4.0__tar.gz

{robotframework-robotlog2db-1.3.8 → robotframework-robotlog2db-1.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: robotframework-robotlog2db
-Version: 1.3.8
+Version: 1.4.0
 Summary: Imports robot result(s) to TestResultWebApp database
 Home-page: https://github.com/test-fullautomation/robotframework-robotlog2db
 Author: Tran Duy Ngoan

{robotframework-robotlog2db-1.3.8 → robotframework-robotlog2db-1.4.0}/RobotLog2DB/robotlog2db.py

@@ -548,6 +548,81 @@ Format the given time string to TestResultWebApp's format for importing to db.
                         fatal_error=True)
    return sFormatedTime
 
+def retrieve_result_starttime(objResult):
+   """
+Retrieve starttime infomration from given result object (TestSuite or TestCase).
+In case the starttime in given suite is 'N/A', it will try to get this information from its children suite/test.
+
+**Arguments:**
+
+*  ``stime``
+
+   / *Condition*: required / *Type*: `TestSuite` or `TestCase` object /
+
+   Result object to retrieve starttime.
+
+**Returns:**
+
+*  / *Type*: str /
+
+   Start time of given result.
+   """
+   lStarttime = []
+   # Try to get starttime from root TestSuite to children TestCase
+   if type(objResult).__name__ == "TestSuite":
+      if objResult.starttime:
+         return objResult.starttime
+      elif len(objResult.suites) > 0:
+         lStarttime = [suite_starttime for suite in objResult.suites if (suite_starttime:=retrieve_result_starttime(suite)) is not None]
+      else:
+         lStarttime = [test_starttime for test in objResult.tests if (test_starttime:=retrieve_result_starttime(test)) is not None]
+   elif type(objResult).__name__ == "TestCase":
+      if objResult.starttime:
+         return objResult.starttime
+
+   if len(lStarttime):
+      return min(lStarttime)
+
+   return None
+
+def retrieve_result_endtime(objResult):
+   """
+Retrieve endtime infomration from given result object (TestSuite or TestCase).
+In case the endtime in given suite is 'N/A', it will try to get this information from its children suite/test.
+
+**Arguments:**
+
+*  ``stime``
+
+   / *Condition*: required / *Type*: `TestSuite` or `TestCase` object /
+
+   Result object to retrieve endtime.
+
+**Returns:**
+
+*  / *Type*: str /
+
+   End time of given result.
+   """
+   lEndtime = []
+   # Try to get endtime from root TestSuite to children TestCase
+   if type(objResult).__name__ == "TestSuite":
+      if objResult.endtime:
+         return objResult.endtime
+      elif len(objResult.suites) > 0:
+         lEndtime = [suite_endtime for suite in objResult.suites if (suite_endtime:=retrieve_result_endtime(suite)) is not None]
+      else:
+         lEndtime = [test_endtime for test in objResult.tests if (test_endtime:=retrieve_result_endtime(test)) is not None]
+   elif type(objResult).__name__ == "TestCase":
+      if objResult.endtime:
+         return objResult.endtime
+
+   if len(lEndtime):
+      return max(lEndtime)
+
+   return None
+
+
 def __process_commandline():
    """
 Process provided argument(s) from command line.
@@ -738,13 +813,20 @@ Process to the lowest suite level (test file):
    else:
       # File metadata
       metadata_info = process_metadata(suite.metadata, root_metadata)
-      _tbl_file_name = suite.source
+      _tbl_file_name = str(suite.source)
       _tbl_file_tester_account = metadata_info['tester']
       if dConfig != None and 'tester' in dConfig:
          _tbl_file_tester_account = dConfig['tester']
       _tbl_file_tester_machine = metadata_info['machine']
-      _tbl_file_time_start     = format_time(suite.starttime)
-      _tbl_file_time_end       = format_time(suite.endtime)
+
+      sSuiteStarttime = retrieve_result_starttime(suite)
+      sSuiteEndtime   = retrieve_result_endtime(suite)
+      if not sSuiteStarttime:
+         Logger.log_error(f"Could not retieve start time of suite '{suite.name}'.")
+      if not sSuiteEndtime:
+         Logger.log_error(f"Could not retieve end time of suite '{suite.name}'.")
+      _tbl_file_time_start     = format_time(sSuiteStarttime)
+      _tbl_file_time_end       = format_time(sSuiteEndtime)
 
       # Process component information if not provided in metadata
       if metadata_info['component'] == '':
@@ -1208,23 +1290,28 @@ Flow to import Robot results to database:
       _tbl_result_version_sw_test   = sVersionTest
 
       # Process start/end time info
-      sSuiteStarttime = result.suite.starttime
-      sSuiteEndtime   = result.suite.endtime
-
-      # Get start and end time of suite a as min and max time incase multiple suite results
-      if (len(sources) > 1) or (len(result.suite.suites) > 0):
-         sSuiteStarttime = min([suite.starttime for suite in result.suite.suites])
-         sSuiteEndtime   = max([suite.endtime for suite in result.suite.suites])
-
-      _tbl_result_time_start = format_time(sSuiteStarttime)
-      _tbl_result_time_end   = format_time(sSuiteEndtime)
+      sExecutionStarttime = retrieve_result_starttime(result.suite)
+      sExecutionEndtime   = retrieve_result_endtime(result.suite)
+      if not sExecutionStarttime:
+         Logger.log_error(f"Could not retieve execution start time."+
+                           "\nPlease use rebot with option '--starttime timestamp' when merging/combining result files."+
+                           "\nOr rerun Robotframework testcase(s) to get proper *.xml result file.",
+                           fatal_error=True)
+      if not sExecutionEndtime:
+         Logger.log_error(f"Could not retieve execution end time."+
+                           "\nPlease use rebot with option '--endtime timestamp' when merging/combining result files."+
+                           "\nOr rerun Robotframework testcase(s) to get proper *.xml result file",
+                           fatal_error=True)
+
+      _tbl_result_time_start = format_time(sExecutionStarttime)
+      _tbl_result_time_end   = format_time(sExecutionEndtime)
 
       # Set version as start time of the execution if not provided in metadata
       # Format: %Y%m%d_%H%M%S
       if _tbl_result_version_sw_target=="":
          bUseDefaultVersionSW = True
          _tbl_result_version_sw_target = re.sub(r'(\d{8})\s(\d{2}):(\d{2}):(\d{2})\.\d+',
-                                                r'\1_\2\3\4', sSuiteStarttime)
+                                                r'\1_\2\3\4', sExecutionStarttime)
       if not args.append:
          Logger.log(f"Set project/variant to '{sVariant}' ({sMsgVarirantSetBy})")
          Logger.log(f"Set version_sw to '{_tbl_result_version_sw_target}' ({sMsgVersionSWSetBy})")

{robotframework-robotlog2db-1.3.8 → robotframework-robotlog2db-1.4.0}/RobotLog2DB/version.py

@@ -18,5 +18,5 @@
 #
 # Version and date of RobotLog2DB
 #
-VERSION      = "1.3.8"
-VERSION_DATE = "21.06.2023"
+VERSION      = "1.4.0"
+VERSION_DATE = "19.09.2023"

{robotframework-robotlog2db-1.3.8 → robotframework-robotlog2db-1.4.0}/RobotLog2DB/xsd/robot.xsd

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" version="3">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" version="4">
     <xs:annotation>
         <xs:documentation xml:lang="en">
             = Robot Framework output.xml schema =
@@ -33,7 +33,7 @@
     <xs:simpleType name="SpecVersion">
         <xs:restriction base="xs:integer">
             <xs:minInclusive value="2" />
-            <xs:maxInclusive value="3" />
+            <xs:maxInclusive value="4" />
         </xs:restriction>
     </xs:simpleType>
     <xs:complexType name="Suite">
@@ -58,6 +58,13 @@
             </xs:extension>
         </xs:simpleContent>
     </xs:complexType>
+    <xs:complexType name="Error">
+        <xs:choice maxOccurs="unbounded">
+        <xs:element name="value" type="xs:string" minOccurs="1" maxOccurs="unbounded" />
+        <xs:element name="msg" type="Message" />
+        <xs:element name="status" type="Status" />
+        </xs:choice>
+    </xs:complexType>
     <xs:complexType name="Test">
         <xs:choice maxOccurs="unbounded">
             <xs:element name="kw" type="Keyword" minOccurs="0" maxOccurs="unbounded" />
@@ -65,6 +72,7 @@
             <xs:element name="if" type="If" minOccurs="0" maxOccurs="unbounded" />
             <xs:element name="try" type="Try" minOccurs="0" maxOccurs="unbounded" />
             <xs:element name="while" type="While" minOccurs="0" maxOccurs="unbounded" />
+            <xs:element name="error" type="Error" minOccurs="0" maxOccurs="unbounded" />
             <xs:element name="msg" type="Message" minOccurs="0" maxOccurs="unbounded" />
             <xs:element name="doc" type="xs:string" minOccurs="0" />
             <xs:element name="tag" type="xs:string" minOccurs="0" maxOccurs="unbounded" />
@@ -84,6 +92,7 @@
             <xs:element name="if" type="If" minOccurs="0" maxOccurs="unbounded" />
             <xs:element name="try" type="Try" minOccurs="0" maxOccurs="unbounded" />
             <xs:element name="while" type="While" minOccurs="0" maxOccurs="unbounded" />
+            <xs:element name="error" type="Error" minOccurs="0" maxOccurs="unbounded" />
             <xs:element name="return" type="Return" minOccurs="0" maxOccurs="unbounded" />
             <xs:element name="msg" type="Message" minOccurs="0" maxOccurs="unbounded" />
             <xs:element name="var" type="xs:string" minOccurs="0" maxOccurs="unbounded" />  <!-- Assignment -->
@@ -115,6 +124,9 @@
             <xs:element name="status" type="BodyItemStatus" />
         </xs:choice>
         <xs:attribute name="flavor" type="ForFlavor" />
+        <xs:attribute name="start" type="xs:string" />    <!-- Used if IN ENUMERATE has `start`. -->
+        <xs:attribute name="mode" type="xs:string" />     <!-- Used if IN ZIP has `mode`. -->
+        <xs:attribute name="fill" type="xs:string" />     <!-- Used if IN ZIP has `fill`. -->
     </xs:complexType>
     <xs:simpleType name="ForFlavor">
         <xs:restriction base="xs:string">
@@ -136,6 +148,7 @@
             <xs:element name="return" type="Return" minOccurs="0" maxOccurs="unbounded" />
             <xs:element name="break" type="Break" minOccurs="0" maxOccurs="unbounded" />
             <xs:element name="continue" type="Continue" minOccurs="0" maxOccurs="unbounded" />
+            <xs:element name="error" type="Error" minOccurs="0" maxOccurs="unbounded" />
             <xs:element name="msg" type="Message" minOccurs="0" maxOccurs="unbounded" />
             <xs:element name="doc" type="xs:string" minOccurs="0" />
             <xs:element name="status" type="BodyItemStatus" />
@@ -166,6 +179,7 @@
             <xs:element name="return" type="Return" minOccurs="0" maxOccurs="unbounded" />
             <xs:element name="break" type="Break" minOccurs="0" maxOccurs="unbounded" />
             <xs:element name="continue" type="Continue" minOccurs="0" maxOccurs="unbounded" />
+            <xs:element name="error" type="Error" minOccurs="0" maxOccurs="unbounded" />
             <xs:element name="msg" type="Message" minOccurs="0" maxOccurs="unbounded" />
             <xs:element name="doc" type="xs:string" minOccurs="0" />
             <xs:element name="status" type="BodyItemStatus" />
@@ -199,6 +213,7 @@
             <xs:element name="return" type="Return" minOccurs="0" maxOccurs="unbounded" />
             <xs:element name="break" type="Break" minOccurs="0" maxOccurs="unbounded" />
             <xs:element name="continue" type="Continue" minOccurs="0" maxOccurs="unbounded" />
+            <xs:element name="error" type="Error" minOccurs="0" maxOccurs="unbounded" />
             <xs:element name="msg" type="Message" minOccurs="0" maxOccurs="unbounded" />
             <xs:element name="doc" type="xs:string" minOccurs="0" />
             <xs:element name="status" type="BodyItemStatus" />
@@ -224,6 +239,9 @@
             <xs:element name="status" type="BodyItemStatus" />
         </xs:choice>
         <xs:attribute name="condition" type="xs:string" />
+        <xs:attribute name="limit" type="xs:string" />
+        <xs:attribute name="on_limit" type="xs:string" />
+        <xs:attribute name="on_limit_message" type="xs:string" />
     </xs:complexType>
     <xs:complexType name="WhileIteration">
         <xs:choice maxOccurs="unbounded">
@@ -235,6 +253,7 @@
             <xs:element name="return" type="Return" minOccurs="0" maxOccurs="unbounded" />
             <xs:element name="break" type="Break" minOccurs="0" maxOccurs="unbounded" />
             <xs:element name="continue" type="Continue" minOccurs="0" maxOccurs="unbounded" />
+            <xs:element name="error" type="Error" minOccurs="0" maxOccurs="unbounded" />
             <xs:element name="msg" type="Message" minOccurs="0" maxOccurs="unbounded" />
             <xs:element name="doc" type="xs:string" minOccurs="0" />
             <xs:element name="status" type="BodyItemStatus" />
@@ -299,6 +318,7 @@
             <xs:enumeration value="PASS" />
             <xs:enumeration value="FAIL" />
             <xs:enumeration value="SKIP" />
+            <xs:enumeration value="NOT RUN" />
             <xs:enumeration value="UNKNOWN" />
         </xs:restriction>
     </xs:simpleType>

{robotframework-robotlog2db-1.3.8 → robotframework-robotlog2db-1.4.0}/robotframework_robotlog2db.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: robotframework-robotlog2db
-Version: 1.3.8
+Version: 1.4.0
 Summary: Imports robot result(s) to TestResultWebApp database
 Home-page: https://github.com/test-fullautomation/robotframework-robotlog2db
 Author: Tran Duy Ngoan