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

Timestamp:

Apr 29, 2020 7:31:28 PM (5 years ago)

Author:

vboxsync

Message:

TestManager/testbox.py: Validation fix for adding testbox with scheduling group memberships. Hidden idTestBox fields didn't validate correctly because they were nil (testbox not existing yet), but hard to tell for invisible fields...

File:

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

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

@@ -686 +686 @@
         dErrors = {};
 
+        # HACK ALERT! idTestBox might not have been validated and converted yet, but we need detect
+        #             adding so we can ignore idTestBox being NIL when validating group memberships.
+        ## @todo make base.py pass us the ksValidateFor_Xxxx value.
+        fIsAdding = True if self.idTestBox in [ None, -1, '-1', 'None', '' ] else False;
+
         for iInGrp, oInSchedGroup in enumerate(self.aoInSchedGroups):
             oInSchedGroup = copy.copy(oInSchedGroup);
             oInSchedGroup.idTestBox = self.idTestBox;
-            dCurErrors = oInSchedGroup.validateAndConvert(oDb, ModelDataBase.ksValidateFor_Other);
+            if fIsAdding:
+                dCurErrors = oInSchedGroup.validateAndConvertEx(['idTestBox',] + oInSchedGroup.kasAllowNullAttributes,
+                                                                oDb, ModelDataBase.ksValidateFor_Add);
+            else:
+                dCurErrors = oInSchedGroup.validateAndConvert(oDb, ModelDataBase.ksValidateFor_Other);
             if not dCurErrors:
                 pass; ## @todo figure out the ID?
@@ -695 +704 @@
                 asErrors = [];
                 for sKey in dCurErrors:
-                    asErrors.append('%s: %s' % (sKey[len('TestBoxInSchedGroup_'):], dCurErrors[sKey]));
+                    asErrors.append('%s: %s' % (sKey[len('TestBoxInSchedGroup_'):], dCurErrors[sKey] + ('{%s}' % self.idTestBox)));
                 dErrors[iInGrp] = '<br>\n'.join(asErrors)
             aoNewValues.append(oInSchedGroup);