Changeset 86950 in vbox

Timestamp:

Nov 20, 2020 7:21:17 PM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

141469

Message:

testmanager/status.py: optional output sorting (for debugging).

File:

• trunk/src/VBox/ValidationKit/testmanager/cgi/status.py (modified) (7 diffs)

trunk/src/VBox/ValidationKit/testmanager/cgi/status.py

@@ -160 +160 @@
 
 
-def format_data(target_dict):
-    content = ""
-    for key in target_dict:
-        if "hours_running" in target_dict[key].keys():
-            content += "{};{};{} | running: {};{} | success: {} | skipped: {} | ".format(key,
-                                                                                         target_dict[key]["testbox_os"],
-                                                                                         target_dict[key]["sched_group"],
-                                                                                         target_dict[key]["running"],
-                                                                                         target_dict[key]["hours_running"],
-                                                                                         target_dict[key]["success"],
-                                                                                         target_dict[key]["skipped"],
-                                                                                         )
-        elif "testbox_os" in target_dict[key].keys():
-            content += "{};{};{} | running: {} | success: {} | skipped: {} | ".format(key,
-                                                                                      target_dict[key]["testbox_os"],
-                                                                                      target_dict[key]["sched_group"],
-                                                                                      target_dict[key]["running"],
-                                                                                      target_dict[key]["success"],
-                                                                                      target_dict[key]["skipped"],
-                                                                                      )
+def formatDataEntry(sKey, dEntry):
+    # There are variations in the first and second "columns".
+    if "hours_running" in dEntry:
+        sRet = "%s;%s;%s | running: %s;%s" \
+             % (sKey, dEntry["testbox_os"], dEntry["sched_group"], dEntry["running"], dEntry["hours_running"]);
+    else:
+        if "testbox_os" in dEntry:
+            sRet = "%s;%s;%s" % (sKey, dEntry["testbox_os"], dEntry["sched_group"],);
         else:
-            content += "{} | running: {} | success: {} | skipped: {} | ".format(key,
-                                                                                target_dict[key]["running"],
-                                                                                target_dict[key]["success"],
-                                                                                target_dict[key]["skipped"],
-                                                                                )
-        content += "bad-testbox: {} | aborted: {} | failure: {} | ".format(
-                                                                            target_dict[key]["bad-testbox"],
-                                                                            target_dict[key]["aborted"],
-                                                                            target_dict[key]["failure"],
-                                                                            )
-        content += "timed-out: {} | rebooted: {} | \n".format(
-                                                             target_dict[key]["timed-out"],
-                                                             target_dict[key]["rebooted"],
-                                                             )
-    return content
+            sRet = sKey;
+        sRet += " | running: %s" % (dEntry["running"],)
+
+    # The rest is currently identical:
+    sRet += " | success: %s | skipped: %s | bad-testbox: %s | aborted: %s | failure: %s | timed-out: %s | rebooted: %s | \n" \
+          % (dEntry["success"], dEntry["skipped"], dEntry["bad-testbox"], dEntry["aborted"],
+             dEntry["failure"], dEntry["timed-out"], dEntry["rebooted"],);
+    return sRet;
+
+
+def format_data(dData, fSorted):
+    sRet = "";
+    if not fSorted:
+        for sKey in dData:
+            sRet += formatDataEntry(sKey, dData[sKey]);
+    else:
+        for sKey in sorted(dData.keys()):
+            sRet += formatDataEntry(sKey, dData[sKey]);
+    return sRet;
 
 ######
@@ -274 +266 @@
         return iValue;
 
+    def _getBoolParam(self, sName, fDefValue = None):
+        """
+        Gets a boolean parameter.
+
+        Raises exception if not found and no default is provided, or if not a
+        valid boolean.
+        """
+        sValue = self._getStringParam(sName, [ 'True', 'true', '1', 'False', 'false', '0'], sDefValue = str(fDefValue));
+        return sValue in ('True', 'true', '1',);
+
     def _checkForUnknownParameters(self):
         """
@@ -308 +310 @@
         #
         cHoursBack = self._getIntParam('cHours', 1, 24*14, 12);
+        fSorted   = self._getBoolParam('fSorted', False);
         self._checkForUnknownParameters();
 
@@ -393 +396 @@
     WHERE   TestBoxesWithStrings.tsExpire = 'infinity'::TIMESTAMP
       AND   SchedGroupNames.idTestBox = TestBoxesWithStrings.idTestBox
-)''', (cHoursBack, cHoursBack,));
+)
+''', (cHoursBack, cHoursBack,));
 
 
@@ -401 +405 @@
         dResult = testbox_data_processing(oDb);
         self._oSrvGlue.setContentType('text/plain');
-        self._oSrvGlue.write(format_data(dResult));
+        self._oSrvGlue.write(format_data(dResult, fSorted));
 
         return True;
@@ -415 +419 @@
         sBranch = self._getStringParam('sBranch');
         cHoursBack = self._getIntParam('cHours', 1, 24*14, 6); ## @todo why 6 hours here and 12 for test boxes?
+        fSorted   = self._getBoolParam('fSorted', False);
         self._checkForUnknownParameters();
 
@@ -470 +475 @@
         # Format and output it.
         self._oSrvGlue.setContentType('text/plain');
-        self._oSrvGlue.write(format_data(dResult));
+        self._oSrvGlue.write(format_data(dResult, fSorted));
 
         return True;