Changeset 83384 in vbox for trunk/src/VBox/ValidationKit/testmanager/core/testbox.py

Timestamp:

Mar 24, 2020 2:46:06 PM (5 years ago)

Author:

vboxsync

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

136601

Message:

TestManager/SchedQueue: Fixed various validation issues with the testbox-in-sched-group stuff. Added change log to the scheduling queue details page.

File:

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

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

@@ -59 +59 @@
     ksParam_iSchedPriority      = 'TestBoxInSchedGroup_iSchedPriority';
 
-    kasAllowNullAttributes      = [ 'idTestBox', 'tsEffective', 'tsExpire', 'uidAuthor', ]
+    kasAllowNullAttributes      = [ 'tsEffective', 'tsExpire', 'uidAuthor', ]
 
     kiMin_iSchedPriority        = 0;
@@ -858 +858 @@
         if not aiSortColumns:
             aiSortColumns = [self.kiSortColumn_sName,];
+        asSortColumns = [self.kdSortColumnMap[i] for i in aiSortColumns];
+        asSortColumns.append('TestBoxesInSchedGroups.idTestBox');
 
         if tsNow is None:
@@ -869 +871 @@
 WHERE   TestBoxesInSchedGroups.idSchedGroup = %s
     AND TestBoxesInSchedGroups.tsExpire     = 'infinity'::TIMESTAMP
-ORDER BY ''' + ', '.join([self.kdSortColumnMap[i] for i in aiSortColumns]) + '''
-''', (idSchedGroup, ));
+ORDER BY ''' + ', '.join(asSortColumns), (idSchedGroup, ));
         else:
             self._oDb.execute('''
@@ -881 +882 @@
                     AND TestBoxesWithStrings.tsEffective <= %s
 WHERE   TestBoxesInSchedGroups.idSchedGroup = %s
-    AND TestBoxesInSchedGroups.tsExpire     > %
-    AND TestBoxesInSchedGroups.tsEffective <= %
-ORDER BY ''' + ', '.join([self.kdSortColumnMap[i] for i in aiSortColumns]) + '''
-''', (tsNow, tsNow, idSchedGroup, tsNow, tsNow, ));
+    AND TestBoxesInSchedGroups.tsExpire     > %s
+    AND TestBoxesInSchedGroups.tsEffective <= %s
+ORDER BY ''' + ', '.join(asSortColumns), (tsNow, tsNow, idSchedGroup, tsNow, tsNow, ));
 
         aoRows = [];