Changeset 67002 in vbox for trunk/src/VBox

Timestamp:

May 22, 2017 9:43:41 AM (8 years ago)

Author:

vboxsync

Message:

schedgroup.py: iSchedPriority sorting fixes, deepTestGroupSort wants descending order.

File:

• trunk/src/VBox/ValidationKit/testmanager/core/schedgroup.py (modified) (4 diffs)

trunk/src/VBox/ValidationKit/testmanager/core/schedgroup.py

@@ -724 +724 @@
 
         Returns an array of SchedGroupMemberDataEx instances (sorted by
-        priority and idTestGroup).  May raise exception DB error.
+        priority (descending) and idTestGroup).  May raise exception DB error.
         """
 
@@ -734 +734 @@
                               '     AND TestGroups.idTestGroup         = SchedGroupMembers.idTestGroup\n'
                               '     AND TestGroups.tsExpire            = \'infinity\'::TIMESTAMP\n'
-                              'ORDER BY SchedGroupMembers.iSchedPriority, SchedGroupMembers.idTestGroup\n'
+                              'ORDER BY SchedGroupMembers.iSchedPriority DESC, SchedGroupMembers.idTestGroup\n'
                               , (idSchedGroup,));
         else:
@@ -757 +757 @@
         Gets the enabled testcases w/ testgroup+priority for the given scheduling group.
 
-        Returns an array TestCaseData instance (group id, testcase priority and
-        testcase ids) with an extra iSchedPriority member.
+        Returns an array of TestCaseData instances (ordered by group id, descending
+        testcase priority, and testcase IDs) with an extra iSchedPriority member.
         May raise exception on DB error or if the result exceeds cMax.
         """
@@ -773 +773 @@
                           '     AND TestCases.tsExpire             = \'infinity\'::TIMESTAMP\n'
                           '     AND TestCases.fEnabled             = TRUE\n'
-                          'ORDER BY TestGroupMembers.idTestGroup, TestGroupMembers.iSchedPriority, TestCases.idTestCase\n'
+                          'ORDER BY TestGroupMembers.idTestGroup, TestGroupMembers.iSchedPriority DESC, TestCases.idTestCase\n'
                           , (idSchedGroup,));