Changeset 61472 in vbox for trunk/src/VBox/ValidationKit/testmanager/core/schedgroup.py

Timestamp:

Jun 5, 2016 5:46:15 PM (9 years ago)

Author:

vboxsync

Message:

testmanager: adding sComment columns to TestCases, TestGroups and SchedGroups.

File:

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

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

@@ -65 +65 @@
     kiMax_iSchedPriority        = 32;
 
+    kcDbColumns                 = 8
 
     def __init__(self):
@@ -125 +126 @@
         """
         SchedGroupMemberData.initFromDbRow(self, aoRow);
-        self.oTestGroup = TestGroupData().initFromDbRow(aoRow[8:]);
+        self.oTestGroup = TestGroupData().initFromDbRow(aoRow[SchedGroupMemberData.kcDbColumns:]);
         return self;
 
@@ -170 +171 @@
     ksParam_idBuildSrc          = 'SchedGroup_idBuildSrc';
     ksParam_idBuildSrcTestSuite = 'SchedGroup_idBuildSrcTestSuite';
+    ksParam_sComment            = 'SchedGroup_sComment';
 
     kasAllowNullAttributes      = ['idSchedGroup', 'tsEffective', 'tsExpire', 'uidAuthor', 'sDescription',
-                                   'idBuildSrc', 'idBuildSrcTestSuite'];
+                                   'idBuildSrc', 'idBuildSrcTestSuite', 'sComment' ];
     kasValidValues_enmScheduler = [ksScheduler_BestEffortContinousItegration, ];
+
+    kcDbColumns                 = 11;
 
     # Scheduler types
@@ -197 +201 @@
         self.enmScheduler            = SchedGroupData.ksScheduler_BestEffortContinousItegration;
         self.idBuildSrc              = None;
-        self.idBuildSrcTestSuite = None;
+        self.idBuildSrcTestSuite     = None;
+        self.sComment                = None;
 
     def initFromDbRow(self, aoRow):
@@ -218 +223 @@
         self.enmScheduler            = aoRow[7];
         self.idBuildSrc              = aoRow[8];
-        self.idBuildSrcTestSuite = aoRow[9];
+        self.idBuildSrcTestSuite     = aoRow[9];
+        self.sComment                = aoRow[10];
         return self;
 
@@ -496 +502 @@
                           '         enmScheduler,\n'
                           '         idBuildSrc,\n'
-                          '         idBuildSrcTestSuite)\n'
-                          'VALUES (%s, %s, %s, %s, %s, %s, %s)\n'
+                          '         idBuildSrcTestSuite,\n'
+                          '         sComment)\n'
+                          'VALUES (%s, %s, %s, %s, %s, %s, %s, %s)\n'
                           'RETURNING idSchedGroup\n'
-                          , (uidAuthor,
-                             oData.sName,
-                             oData.sDescription,
-                             oData.fEnabled,
-                             oData.enmScheduler,
-                             oData.idBuildSrc,
-                             oData.idBuildSrcTestSuite));
+                          , ( uidAuthor,
+                              oData.sName,
+                              oData.sDescription,
+                              oData.fEnabled,
+                              oData.enmScheduler,
+                              oData.idBuildSrc,
+                              oData.idBuildSrcTestSuite,
+                              oData.sComment ));
         idSchedGroup = self._oDb.fetchOne()[0];
         oData.idSchedGroup = idSchedGroup;
@@ -803 +811 @@
     def exists(self, sName):
         """Checks if a group with the given name exists."""
-        self._oDb.execute('SELECT *\n'
+        self._oDb.execute('SELECT idSchedGroup\n'
                           'FROM   SchedGroups\n'
                           'WHERE  tsExpire   = \'infinity\'::TIMESTAMP\n'
-                          '   AND sName = %s\n'
+                          '   AND sName      = %s\n'
+                          'LIMIT 1\n'
                           , (sName,));
         return self._oDb.getRowCount() > 0;
@@ -814 +823 @@
         self._oDb.execute('SELECT   *\n'
                           'FROM     SchedGroups\n'
-                          'WHERE    tsExpire   = \'infinity\'::timestamp\n'
+                          'WHERE    tsExpire     = \'infinity\'::timestamp\n'
                           '  AND    idSchedGroup = %s;', (idSchedGroup,))
         aRows = self._oDb.fetchAll()
@@ -825 +834 @@
             return None
 
-    def remove(self, uidAuthor, idScedGroup, fNeedCommit=True):
-        """Historize Scheduling Group record"""
-        self._oDb.execute('UPDATE SchedGroups\n'
-                          'SET    tsExpire     = CURRENT_TIMESTAMP,\n'
-                          '       uidAuthor    = %s\n'
-                          'WHERE  idSchedGroup = %s\n'
-                          '   AND tsExpire     = \'infinity\'::TIMESTAMP\n',
-                          (uidAuthor, idScedGroup))
-        if fNeedCommit:
-            self._oDb.commit()
-        return True
 
     #
@@ -878 +876 @@
                           '         enmScheduler,\n'
                           '         idBuildSrc,\n'
-                          '         idBuildSrcTestSuite )\n'
-                          'VALUES ( %s, %s, %s, %s, %s, %s, %s, %s, %s )\n'
+                          '         idBuildSrcTestSuite,\n'
+                          '         sComment )\n'
+                          'VALUES ( %s, %s, %s, %s, %s, %s, %s, %s, %s, %s )\n'
                           , ( uidAuthor,
                               tsEffective,
@@ -888 +887 @@
                               oData.enmScheduler,
                               oData.idBuildSrc,
-                              oData.idBuildSrcTestSuite, ));
+                              oData.idBuildSrcTestSuite,
+                              oData.sComment, ));
         return True;