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

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

@@ -38 +38 @@
 from common                             import utils;
 from testmanager.core.base              import ModelDataBase, ModelDataBaseTestCase, ModelLogicBase, TMExceptionBase, \
-                                               ChangeLogEntry, AttributeChangeEntry;
+                                               TMInvalidData, TMRowNotFound, ChangeLogEntry, AttributeChangeEntry;
 from testmanager.core.globalresource    import GlobalResourceData;
 from testmanager.core.useraccount       import UserAccountLogic;
@@ -75 +75 @@
         """
         if aoRow is None:
-            raise TMExceptionBase('Test case not found.');
+            raise TMRowNotFound('Test case not found.');
 
         self.idTestCase         = aoRow[0];
@@ -214 +214 @@
         """
         if aoRow is None:
-            raise TMExceptionBase('Test case not found.');
+            raise TMRowNotFound('Test case not found.');
 
         self.idTestCase         = aoRow[0];
@@ -242 +242 @@
         return True
 
-    def validateAndConvert(self, oDb = None):
+    def validateAndConvert(self, oDb = None, enmValidateFor = ModelDataBase.ksValidateFor_Other):
         """
         Validates the input and converts valid fields to their right type.
@@ -259 +259 @@
 
         _ = oDb;
+        _ = enmValidateFor;
         return dErrors
 
@@ -469 +470 @@
         """
         if aoRow is None:
-            raise TMExceptionBase('Test case not found.');
+            raise TMRowNotFound('Test case not found.');
 
         self.idTestCase         = aoRow[0];
@@ -497 +498 @@
         aoRow = oDb.fetchOne()
         if aoRow is None:
-            raise TMExceptionBase('idTestCase=%s not found (tsNow=%s sPeriodBack=%s)' % (idTestCase, tsNow, sPeriodBack,));
+            raise TMRowNotFound('idTestCase=%s not found (tsNow=%s sPeriodBack=%s)' % (idTestCase, tsNow, sPeriodBack,));
         return self.initFromDbRow(aoRow);
 
@@ -810 +811 @@
         """
         TestCaseData.initFromDbWithGenId(self, oDb, idGenTestCase);
-        if tsNow == None and not oDb.isTsInfinity(self.tsExpire):
+        if tsNow is None and not oDb.isTsInfinity(self.tsExpire):
             tsNow = self.tsEffective;
         return self._initExtraMembersFromDb(oDb, tsNow);
@@ -890 +891 @@
                 oVar = copy.copy(self.aoTestCaseArgs[iVar]);
                 oVar.idTestCase = self.idTestCase;
-                dCurErrors = oVar.validateAndConvert(oDb);
+                dCurErrors = oVar.validateAndConvert(oDb, ModelDataBase.ksValidateFor_Other);
                 if len(dCurErrors) == 0:
                     pass; ## @todo figure out the ID?
@@ -915 +916 @@
         return (aoNewValues, None if len(asErrors) == 0 else ' <br>'.join(asErrors));
 
-    def _validateAndConvertWorker(self, asAllowNullAttributes, oDb):
-        dErrors = TestCaseData._validateAndConvertWorker(self, asAllowNullAttributes, oDb);
+    def _validateAndConvertWorker(self, asAllowNullAttributes, oDb, enmValidateFor = ModelDataBase.ksValidateFor_Other):
+        dErrors = TestCaseData._validateAndConvertWorker(self, asAllowNullAttributes, oDb, enmValidateFor);
 
         # Validate dependencies a wee bit for paranoid reasons. The scheduler
@@ -1127 +1128 @@
         #
         assert isinstance(oData, TestCaseDataEx);
-        dErrors = oData.validateAndConvert(self._oDb);
+        dErrors = oData.validateAndConvert(self._oDb, oData.ksValidateFor_Add);
         if len(dErrors) > 0:
-            raise TMExceptionBase('Invalid input data: %s' % (dErrors,));
+            raise TMInvalidData('Invalid input data: %s' % (dErrors,));
 
         #
@@ -1171 +1172 @@
         #
         assert isinstance(oData, TestCaseDataEx);
-        dErrors = oData.validateAndConvert(self._oDb);
+        dErrors = oData.validateAndConvert(self._oDb, oData.ksValidateFor_Edit);
         if len(dErrors) > 0:
-            raise TMExceptionBase('Invalid input data: %s' % (dErrors,));
+            raise TMInvalidData('Invalid input data: %s' % (dErrors,));
 
         #