Changeset 83342 in vbox for trunk

Timestamp:

Mar 19, 2020 8:45:24 PM (5 years ago)

Author:

vboxsync

Message:

TestManager/schedqueue.py: Ignore SchedQueues.fEnabled as we no longer generate queue items for disabled scheduling groups. bugref:9657

Location:

trunk/src/VBox/ValidationKit/testmanager

Files:

• core/schedqueue.py (modified) (4 diffs)
• webui/wuiadminschedqueue.py (modified) (1 diff)

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

@@ -52 +52 @@
         self.sTestCase          = None
         self.fUpToDate          = None
-        self.fEnabled           = None
 
     def initFromDbRow(self, aoRow):
@@ -68 +67 @@
         self.sTestCase          = aoRow[4]
         self.fUpToDate          = aoRow[5]
-        self.fEnabled           = aoRow[6]
         return self
 
@@ -98 +96 @@
        AND TestCaseArgs.tsExpire = 'infinity'::TIMESTAMP
        AND TestCases.tsExpire    = 'infinity'::TIMESTAMP AS fUpToDate,
-       SchedGroups.fEnabled,
        ROW_NUMBER() OVER (PARTITION BY SchedQueues.idSchedGroup
                               ORDER BY SchedQueues.tsLastScheduled,
@@ -118 +115 @@
               AND TestCases.tsEffective         <= SchedQueues.tsConfig
 ORDER BY iPerSchedGroupRowNumber,
-         SchedGroups.fEnabled,
          SchedGroups.sName
 LIMIT %s OFFSET %s''' % (cMaxRows, iStart,))

trunk/src/VBox/ValidationKit/testmanager/webui/wuiadminschedqueue.py

@@ -53 +53 @@
         oEntry = self._aoEntries[iEntry] # type: SchedQueueEntry
         sState = 'up-to-date' if oEntry.fUpToDate else 'outdated';
-        if not oEntry.fEnabled:
-            sState += ' disabled';
         return [ oEntry.tsLastScheduled, oEntry.sSchedGroup, oEntry.sTestGroup, oEntry.sTestCase, sState, oEntry.idItem ];