Changeset 61220 in vbox for trunk/src/VBox/ValidationKit/testmanager/core/buildsource.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/buildsource.py (modified) (7 diffs)

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

@@ -35 +35 @@
 # Validation Kit imports.
 from common                             import utils;
-from testmanager.core.base              import ModelDataBase, ModelDataBaseTestCase, ModelLogicBase, TMExceptionBase;
+from testmanager.core.base              import ModelDataBase, ModelDataBaseTestCase, ModelLogicBase, TMRowAlreadyExists, \
+                                               TMRowInUse, TMInvalidData, TMRowNotFound;
 from testmanager.core                   import coreconsts;
 
@@ -90 +91 @@
         """
         if aoRow is None:
-            raise TMExceptionBase('Build source not found.');
+            raise TMRowNotFound('Build source not found.');
 
         self.idBuildSrc         = aoRow[0];
@@ -118 +119 @@
         aoRow = oDb.fetchOne()
         if aoRow is None:
-            raise TMExceptionBase('idBuildSrc=%s not found (tsNow=%s sPeriodBack=%s)' % (idBuildSrc, tsNow, sPeriodBack,));
+            raise TMRowNotFound('idBuildSrc=%s not found (tsNow=%s sPeriodBack=%s)' % (idBuildSrc, tsNow, sPeriodBack,));
         return self.initFromDbRow(aoRow);
 
@@ -205 +206 @@
         # Validate the input.
         #
-        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._assertUnique(oData, None);
 
@@ -247 +248 @@
         # Validate the input and read the old entry.
         #
-        dErrors = oData.validateAndConvert(self._oDb);
+        dErrors = oData.validateAndConvert(self._oDb, oData.ksValidateFor_Edit);
         if len(dErrors) > 0:
-            raise TMExceptionBase('addEntry invalid input: %s' % (dErrors,));
+            raise TMInvalidData('addEntry invalid input: %s' % (dErrors,));
         self._assertUnique(oData, oData.idBuildSrc);
         oOldData = BuildSourceData().initFromDbWithId(self._oDb, oData.idBuildSrc);
@@ -303 +304 @@
                 for aoRow in self._oDb.fetchAll():
                     asGroups.append('%s (#%d)' % (aoRow[1], aoRow[0]));
-                raise TMExceptionBase('Build source #%d is used by one or more scheduling groups: %s'
-                                      % (idBuildSrc, ', '.join(asGroups),));
+                raise TMRowInUse('Build source #%d is used by one or more scheduling groups: %s'
+                                 % (idBuildSrc, ', '.join(asGroups),));
         else:
             self._oDb.execute('UPDATE   SchedGroups\n'
@@ -435 +436 @@
                           , ( oData.sName, ))
         if self._oDb.getRowCount() > 0:
-            raise TMExceptionBase('A build source with name "%s" already exist.' % (oData.sName,));
+            raise TMRowAlreadyExists('A build source with name "%s" already exist.' % (oData.sName,));
         return True;