Changeset 61593 in vbox for trunk/src/VBox

Timestamp:

Jun 8, 2016 8:14:11 PM (9 years ago)

Author:

vboxsync

Message:

testmanager: attempt to fix broken testbox list actions. unfortuantely, the scheduling group migration had to go since it's now ambigious wrt multiple scheduling group participation of testboxes.

File:

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

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

@@ -771 +771 @@
         if len(dDataErrors) > 0:
             raise TMInvalidData('TestBoxLogic.addEntry: %s' % (dDataErrors,));
-        if len(oData.aoInSchedGroups):
-            sSchedGrps = ', '.join('(%s)' % oCur.idSchedGroup for oCur in oData.aoInSchedGroups);
-            self._oDb.execute('SELECT   SchedGroupIDs.idSchedGroup\n'
-                              'FROM     (VALUES ' + sSchedGrps + ' ) AS SchedGroupIDs(idSchedGroup)\n'
-                              '         LEFT OUTER JOIN SchedGroups\n'
-                              '                      ON     SchedGroupIDs.idSchedGroup = SchedGroups.idSchedGroup\n'
-                              '                         AND SchedGroups.tsExpire = \'infinity\'::TIMESTAMP\n'
-                              'WHERE    SchedGroups.idSchedGroup IS NULL\n');
-            aaoRows = self._oDb.fetchAll();
-            if len(aaoRows) > 0:
-                raise TMInvalidData('TestBoxLogic.addEntry missing scheduling groups: %s'
-                                    % (', '.join(str(aoRow[0]) for aoRow in aaoRows),));
+        if isinstance(oData, TestBoxDataEx):
+            if len(oData.aoInSchedGroups):
+                sSchedGrps = ', '.join('(%s)' % oCur.idSchedGroup for oCur in oData.aoInSchedGroups);
+                self._oDb.execute('SELECT   SchedGroupIDs.idSchedGroup\n'
+                                  'FROM     (VALUES ' + sSchedGrps + ' ) AS SchedGroupIDs(idSchedGroup)\n'
+                                  '         LEFT OUTER JOIN SchedGroups\n'
+                                  '                      ON     SchedGroupIDs.idSchedGroup = SchedGroups.idSchedGroup\n'
+                                  '                         AND SchedGroups.tsExpire = \'infinity\'::TIMESTAMP\n'
+                                  'WHERE    SchedGroups.idSchedGroup IS NULL\n');
+                aaoRows = self._oDb.fetchAll();
+                if len(aaoRows) > 0:
+                    raise TMInvalidData('TestBoxLogic.addEntry missing scheduling groups: %s'
+                                        % (', '.join(str(aoRow[0]) for aoRow in aaoRows),));
         return None;
 
@@ -827 +828 @@
         Data edit update, web UI is the primary user.
 
-        oData is either TestBoxDataEx or TestBoxData.
+        oData is either TestBoxDataEx or TestBoxData.  The latter is for enabling 
         Returns the new generation ID and effective date.
         """