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

Timestamp:

Jun 11, 2019 11:58:28 AM (6 years ago)

Author:

vboxsync

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

131247

Message:

ValKit: New pylint version - cleanup in progress.

File:

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

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

@@ -259 +259 @@
     def __init__(self):
         SchedGroupData.__init__(self);
-        self.aoMembers          = [];       # type: SchedGroupMemberDataEx
+        self.aoMembers          = []        # type: SchedGroupMemberDataEx
 
         # Two build sources for convenience sake.
-        self.oBuildSrc          = None;     # type: TestBoxData
-        self.oBuildSrcValidationKit = None; # type: TestBoxData
+        self.oBuildSrc          = None      # type: TestBoxData
+        self.oBuildSrcValidationKit = None  # type: TestBoxData
         # List of test boxes that uses this group for convenience.
-        self.aoTestBoxes        = None;     # type: list[TestBoxData]
+        self.aoTestBoxes        = None      # type: list[TestBoxData]
 
     def _initExtraMembersFromDb(self, oDb, tsNow = None, sPeriodBack = None):
@@ -421 +421 @@
 
 
-class SchedGroupLogic(ModelLogicBase): # pylint: disable=R0903
+class SchedGroupLogic(ModelLogicBase): # pylint: disable=too-few-public-methods
     """
     SchedGroup logic.
@@ -578 +578 @@
                 raise TMRowInUse('Scheduling group #%d is associated with one or more test boxes: %s'
                                  % (idSchedGroup, ', '.join(asTestBoxes),));
-            else:
-                # Reassign testboxes to scheduling group #1 (the default group).
-                oTbLogic = TestBoxLogic(self._oDb);
-                for oTestBox in oData.aoTestBoxes:
-                    oTbCopy = TestBoxData().initFromOther(oTestBox);
-                    oTbCopy.idSchedGroup = 1;
-                    oTbLogic.editEntry(oTbCopy, uidAuthor, fCommit = False);
-
-                oData = SchedGroupDataEx().initFromDbWithId(self._oDb, idSchedGroup);
-                if oData.aoTestBoxes:
-                    raise TMRowInUse('More testboxes was added to the scheduling group as we were trying to delete it.');
+            # Reassign testboxes to scheduling group #1 (the default group).
+            oTbLogic = TestBoxLogic(self._oDb);
+            for oTestBox in oData.aoTestBoxes:
+                oTbCopy = TestBoxData().initFromOther(oTestBox);
+                oTbCopy.idSchedGroup = 1;
+                oTbLogic.editEntry(oTbCopy, uidAuthor, fCommit = False);
+
+            oData = SchedGroupDataEx().initFromDbWithId(self._oDb, idSchedGroup);
+            if oData.aoTestBoxes:
+                raise TMRowInUse('More testboxes was added to the scheduling group as we were trying to delete it.');
 
         #
@@ -982 +981 @@
 #
 
-# pylint: disable=C0111
+# pylint: disable=missing-docstring
 class SchedGroupMemberDataTestCase(ModelDataBaseTestCase):
     def setUp(self):