Changeset 61220 in vbox for trunk/src/VBox/ValidationKit/testmanager/core/testgroup.py

Timestamp:

May 27, 2016 1:16:02 AM (9 years ago)

Author:

vboxsync

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

107509

Message:

testmanager: failiure reason fixes, some exception throwing cleanups, delinting with pylint 1.5.5.

File:

• trunk/src/VBox/ValidationKit/testmanager/core/testgroup.py (modified) (12 diffs)

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

@@ -34 +34 @@
 
 # Validation Kit imports.
-from testmanager.core.base              import ModelDataBase, ModelDataBaseTestCase, ModelLogicBase, TMExceptionBase
+from testmanager.core.base              import ModelDataBase, ModelDataBaseTestCase, ModelLogicBase, TMRowInUse, \
+                                               TMTooManyRows, TMInvalidData, TMRowNotFound, TMRowAlreadyExists;
 from testmanager.core.testcase          import TestCaseData, TestCaseDataEx;
 
@@ -75 +76 @@
         """
         if aoRow is None:
-            raise TMExceptionBase('Test group member not found.')
+            raise TMRowNotFound('Test group member not found.')
 
         self.idTestGroup     = aoRow[0];
@@ -144 +145 @@
         return asAttributes;
 
-    def _validateAndConvertWorker(self, asAllowNullAttributes, oDb):
-        dErrors = TestGroupMemberData._validateAndConvertWorker(self, asAllowNullAttributes, oDb);
+    def _validateAndConvertWorker(self, asAllowNullAttributes, oDb, enmValidateFor = ModelDataBase.ksValidateFor_Other):
+        dErrors = TestGroupMemberData._validateAndConvertWorker(self, asAllowNullAttributes, oDb, enmValidateFor);
         if self.ksParam_idTestCase not in dErrors:
             self.oTestCase = TestCaseDataEx()
@@ -230 +231 @@
         """
         if aoRow is None:
-            raise TMExceptionBase('Test group not found.')
+            raise TMRowNotFound('Test group not found.')
 
         self.idTestGroup     = aoRow[0]
@@ -251 +252 @@
         aoRow = oDb.fetchOne()
         if aoRow is None:
-            raise TMExceptionBase('idTestGroup=%s not found (tsNow=%s sPeriodBack=%s)' % (idTestGroup, tsNow, sPeriodBack,));
+            raise TMRowNotFound('idTestGroup=%s not found (tsNow=%s sPeriodBack=%s)' % (idTestGroup, tsNow, sPeriodBack,));
         return self.initFromDbRow(aoRow);
 
@@ -355 +356 @@
             aoNewMembers.append(oNewMember);
 
-            dErrors = oNewMember.validateAndConvert(oDb);
+            dErrors = oNewMember.validateAndConvert(oDb, ModelDataBase.ksValidateFor_Other);
             if len(dErrors) > 0:
                 asErrors.append(str(dErrors));
 
         if len(asErrors) == 0:
-            for i in range(len(aoNewMembers)):
+            for i, _ in enumerate(aoNewMembers):
                 idTestCase = aoNewMembers[i];
                 for j in range(i + 1, len(aoNewMembers)):
@@ -416 +417 @@
         #
         assert isinstance(oData, TestGroupDataEx);
-        dErrors = oData.validateAndConvert(self._oDb);
+        dErrors = oData.validateAndConvert(self._oDb, oData.ksValidateFor_Add);
         if len(dErrors) > 0:
-            raise TMExceptionBase('addEntry invalid input: %s' % (dErrors,));
+            raise TMInvalidData('addEntry invalid input: %s' % (dErrors,));
         self._assertUniq(oData, None);
 
@@ -449 +450 @@
         #
         assert isinstance(oData, TestGroupDataEx);
-        dErrors = oData.validateAndConvert(self._oDb);
+        dErrors = oData.validateAndConvert(self._oDb, oData.ksValidateFor_Edit);
         if len(dErrors) > 0:
-            raise TMExceptionBase('editEntry invalid input: %s' % (dErrors,));
+            raise TMInvalidData('editEntry invalid input: %s' % (dErrors,));
         self._assertUniq(oData, oData.idTestGroup);
 
@@ -481 +482 @@
             oNewMember.idTestGroup = oData.idTestGroup;
             if oNewMember.idTestCase in dNew:
-                raise TMExceptionBase('Duplicate test group member: idTestCase=%d (%s / %s)'
-                                      % (oNewMember.idTestCase, oNewMember, dNew[oNewMember.idTestCase],));
+                raise TMRowAlreadyExists('Duplicate test group member: idTestCase=%d (%s / %s)'
+                                         % (oNewMember.idTestCase, oNewMember, dNew[oNewMember.idTestCase],));
             dNew[oNewMember.idTestCase] = oNewMember;
 
@@ -525 +526 @@
             if len(aoGroups) > 0:
                 asGroups = ['%s (#%d)' % (sName, idSchedGroup) for idSchedGroup, sName in aoGroups];
-                raise TMExceptionBase('Test group #%d is member of one ore more scheduling groups: %s'
-                                      % (idTestGroup, ', '.join(asGroups),));
+                raise TMRowInUse('Test group #%d is member of one or more scheduling groups: %s'
+                                 % (idTestGroup, ', '.join(asGroups),));
         else:
             self._oDb.execute('UPDATE   SchedGroupMembers\n'
@@ -645 +646 @@
         aRows = self._oDb.fetchAll()
         if len(aRows) not in (0, 1):
-            raise TMExceptionBase('Found more than one test groups with the same credentials. Database structure is corrupted.')
+            raise TMTooManyRows('Found more than one test groups with the same credentials. Database structure is corrupted.')
         try:
             return TestGroupData().initFromDbRow(aRows[0])
@@ -664 +665 @@
                           , ( oData.sName, ))
         if self._oDb.getRowCount() > 0:
-            raise TMExceptionBase('A Test group with name "%s" already exist.' % (oData.sName,));
+            raise TMRowAlreadyExists('A Test group with name "%s" already exist.' % (oData.sName,));
         return True;