Changeset 61592 in vbox for trunk/src/VBox/ValidationKit/testmanager/core

Timestamp:

Jun 8, 2016 8:10:20 PM (8 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

@@ -826 +826 @@
         """
         Data edit update, web UI is the primary user.
+
+        oData is either TestBoxDataEx or TestBoxData.
         Returns the new generation ID and effective date.
         """
@@ -862 +864 @@
             tsEffective  = oOldData.tsEffective;
 
-        # Calc in-group changes.
-        aoRemoved = list(oOldData.aoInSchedGroups);
-        aoNew     = [];
-        aoUpdated = [];
-        for oNewInGroup in oData.aoInSchedGroups:
-            oOldInGroup = None;
-            for iCur, oCur in enumerate(aoRemoved):
-                if oCur.idSchedGroup == oNewInGroup.idSchedGroup:
-                    oOldInGroup = aoRemoved.pop(iCur);
-                    break;
-            if oOldInGroup is None:
-                aoNew.append(oNewInGroup);
-            elif oNewInGroup.iSchedPriority != oOldInGroup.iSchedPriority:
-                aoUpdated.append(oNewInGroup);
-
-        # Remove in-groups.
-        for oInGroup in aoRemoved:
-            self._oDb.callProc('TestBoxLogic_removeGroupEntry', (uidAuthor, oData.idTestBox, oInGroup.idSchedGroup, ));
-
-        # Add new ones.
-        for oInGroup in aoNew:
-            self._oDb.callProc('TestBoxLogic_addGroupEntry',
-                               ( uidAuthor, oData.idTestBox, oInGroup.idSchedGroup, oInGroup.iSchedPriority, ) );
-
-        # Edit existing ones.
-        for oInGroup in aoUpdated:
-            self._oDb.callProc('TestBoxLogic_editGroupEntry',
-                               ( uidAuthor, oData.idTestBox, oInGroup.idSchedGroup, oInGroup.iSchedPriority, ) );
+        if isinstance(oData, TestBoxDataEx):
+            # Calc in-group changes.
+            aoRemoved = list(oOldData.aoInSchedGroups);
+            aoNew     = [];
+            aoUpdated = [];
+            for oNewInGroup in oData.aoInSchedGroups:
+                oOldInGroup = None;
+                for iCur, oCur in enumerate(aoRemoved):
+                    if oCur.idSchedGroup == oNewInGroup.idSchedGroup:
+                        oOldInGroup = aoRemoved.pop(iCur);
+                        break;
+                if oOldInGroup is None:
+                    aoNew.append(oNewInGroup);
+                elif oNewInGroup.iSchedPriority != oOldInGroup.iSchedPriority:
+                    aoUpdated.append(oNewInGroup);
+
+            # Remove in-groups.
+            for oInGroup in aoRemoved:
+                self._oDb.callProc('TestBoxLogic_removeGroupEntry', (uidAuthor, oData.idTestBox, oInGroup.idSchedGroup, ));
+
+            # Add new ones.
+            for oInGroup in aoNew:
+                self._oDb.callProc('TestBoxLogic_addGroupEntry',
+                                   ( uidAuthor, oData.idTestBox, oInGroup.idSchedGroup, oInGroup.iSchedPriority, ) );
+
+            # Edit existing ones.
+            for oInGroup in aoUpdated:
+                self._oDb.callProc('TestBoxLogic_editGroupEntry',
+                                   ( uidAuthor, oData.idTestBox, oInGroup.idSchedGroup, oInGroup.iSchedPriority, ) );
+        else:
+            assert isinstance(oData, TestBoxData);
 
         self._oDb.maybeCommit(fCommit);