Changeset 86953 in vbox for trunk/src/VBox/ValidationKit/testmanager/cgi

Timestamp:

Nov 23, 2020 10:31:51 AM (4 years ago)

Author:

vboxsync

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

141473

Message:

testmanager/status.py: Try eliminating datetime dependency. bugref:9788

File:

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

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

@@ -34 +34 @@
 import os
 import sys
-import datetime
 
 # Only the main script needs to modify the path.
@@ -92 +91 @@
 
 
-def find_test_duration(created):
-    now = datetime.datetime.utcnow().replace(tzinfo=datetime.timezone.utc)
-    diff = now - created
-    days, seconds = diff.days, diff.seconds
-    hours = days * 24 + seconds // 3600
-    return hours
+def timeDeltaToHours(oTimeDelta):
+    return oTimeDelta.days * 24 + oTimeDelta.seconds // 3600
 
 
@@ -108 +103 @@
         testbox_name = line[0]
         test_result = line[1]
-        test_created = line[2]
+        oTimeDeltaSinceStarted = line[2]
         test_box_os = line[3]
         test_sched_group = line[4]
@@ -122 +117 @@
 
         if test_result == "running":
-            testboxes_dict[testbox_name].update({"hours_running": find_test_duration(test_created)})
+            testboxes_dict[testbox_name].update({"hours_running": timeDeltaToHours(oTimeDeltaSinceStarted)})
 
     return testboxes_dict;
@@ -136 +131 @@
     elif testbox_os == "solaris":
         dict_update(vb_dict, test_name + " / solaris", test_result)
-#    else:
-#        dict_update(vb_dict, test_name + " / other", test_result)
+    else:
+        dict_update(vb_dict, test_name + " / other", test_result)
 
 
@@ -330 +325 @@
         #SELECT  TestBoxesWithStrings.sName,
         #        TestSets.enmStatus,
-        #        TestSets.tsCreated,
+        #        CURRENT_TIME - TestSets.tsCreated,
         #        TestBoxesWithStrings.sOS,
         #        SchedGroupNames.sSchedGroupNames
@@ -353 +348 @@
 (   SELECT  TestBoxesWithStrings.sName,
             TestSets.enmStatus,
-            TestSets.tsCreated,
+            CURRENT_TIME - TestSets.tsCreated,
             TestBoxesWithStrings.sOS,
             SchedGroupNames.sSchedGroupNames
@@ -376 +371 @@
     SELECT  TestBoxesWithStrings.sName,
             TestSets.enmStatus,
-            TestSets.tsCreated,
+            CURRENT_TIME - TestSets.tsCreated,
             TestBoxesWithStrings.sOS,
             SchedGroupNames.sSchedGroupNames