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

Timestamp:

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

Author:

vboxsync

Message:

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

File:

• trunk/src/VBox/ValidationKit/testmanager/core/build.py (modified) (11 diffs)

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

@@ -37 +37 @@
 from testmanager                        import config;
 from testmanager.core                   import coreconsts;
-from testmanager.core.base              import ModelDataBase, ModelDataBaseTestCase, ModelLogicBase, TMExceptionBase;
+from testmanager.core.base              import ModelDataBase, ModelDataBaseTestCase, ModelLogicBase, TMExceptionBase, \
+                                               TMTooManyRows, TMInvalidData, TMRowNotFound, TMRowInUse;
 
 
@@ -76 +77 @@
         """
         if aoRow is None:
-            raise TMExceptionBase('BuildCategory not found.');
+            raise TMRowNotFound('BuildCategory not found.');
 
         self.idBuildCategory     = aoRow[0];
@@ -94 +95 @@
         aoRow = oDb.fetchOne()
         if aoRow is None:
-            raise TMExceptionBase('idBuildCategory=%s not found' % (idBuildCategory, ));
+            raise TMRowNotFound('idBuildCategory=%s not found' % (idBuildCategory, ));
         return self.initFromDbRow(aoRow);
 
@@ -220 +221 @@
         cBuilds = self._oDb.fetchOne()[0];
         if cBuilds > 0:
-            raise TMExceptionBase('Build category #%d is used by %d builds and can therefore not be deleted.'
-                                  % (idBuildCategory, cBuilds,));
+            raise TMRowInUse('Build category #%d is used by %d builds and can therefore not be deleted.'
+                             % (idBuildCategory, cBuilds,));
 
         #
@@ -294 +295 @@
 
         # Check BuildCategoryData before do anything
-        dDataErrors = oData.validateAndConvert(self._oDb);
+        dDataErrors = oData.validateAndConvert(self._oDb, oData.ksValidateFor_Add);
         if len(dDataErrors) > 0:
-            raise TMExceptionBase('Invalid data passed to addBuildCategory(): %s' % (dDataErrors,));
+            raise TMInvalidData('Invalid data passed to addBuildCategory(): %s' % (dDataErrors,));
 
         # Does it already exist?
@@ -363 +364 @@
         """
         if aoRow is None:
-            raise TMExceptionBase('Build not found.');
+            raise TMRowNotFound('Build not found.');
 
         self.idBuild            = aoRow[0];
@@ -389 +390 @@
         aoRow = oDb.fetchOne()
         if aoRow is None:
-            raise TMExceptionBase('idBuild=%s not found (tsNow=%s sPeriodBack=%s)' % (idBuild, tsNow, sPeriodBack,));
+            raise TMRowNotFound('idBuild=%s not found (tsNow=%s sPeriodBack=%s)' % (idBuild, tsNow, sPeriodBack,));
         return self.initFromDbRow(aoRow);
 
@@ -443 +444 @@
         """
         if aoRow is None:
-            raise TMExceptionBase('Build not found.');
+            raise TMRowNotFound('Build not found.');
         BuildData.initFromDbRow(self, aoRow);
         self.oCat = BuildCategoryData().initFromDbRow(aoRow[11:]);
@@ -461 +462 @@
         aoRow = oDb.fetchOne()
         if aoRow is None:
-            raise TMExceptionBase('idBuild=%s not found (tsNow=%s sPeriodBack=%s)' % (idBuild, tsNow, sPeriodBack,));
+            raise TMRowNotFound('idBuild=%s not found (tsNow=%s sPeriodBack=%s)' % (idBuild, tsNow, sPeriodBack,));
         return self.initFromDbRow(aoRow);
 
@@ -556 +557 @@
         # Validate input and get current data.
         #
-        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,));
         oOldData = BuildData().initFromDbWithId(self._oDb, oData.idBuild);
 
@@ -714 +715 @@
         aRows = self._oDb.fetchAll()
         if len(aRows) not in (0, 1):
-            raise TMExceptionBase('Found more than one build with the same credentials. Database structure is corrupted.')
+            raise TMTooManyRows('Found more than one build with the same credentials. Database structure is corrupted.')
         try:
             return BuildDataEx().initFromDbRow(aRows[0])