Changeset 79092 in vbox for trunk/src/VBox/ValidationKit/testmanager/webui

Timestamp:

Jun 11, 2019 3:26:40 PM (6 years ago)

Author:

vboxsync

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

131252

Message:

ValKit,++: Pylint 2.3.1 adjustments.

Location:

trunk/src/VBox/ValidationKit/testmanager/webui

Files:

• wuibase.py (modified) (4 diffs)
• wuicontentbase.py (modified) (2 diffs)
• wuigraphwiz.py (modified) (1 diff)
• wuihlpgraphgooglechart.py (modified) (1 diff)
• wuihlpgraphmatplotlib.py (modified) (1 diff)
• wuihlpgraphsimple.py (modified) (1 diff)
• wuimain.py (modified) (6 diffs)
• wuireport.py (modified) (1 diff)

trunk/src/VBox/ValidationKit/testmanager/webui/wuibase.py

@@ -53 +53 @@
     For exceptions raised by Web UI code.
     """
-    pass;
+    pass;                               # pylint: disable=unnecessary-pass
 
 
@@ -410 +410 @@
         # HACK: Checkboxes doesn't return a value when unchecked, so we always
         #       provide a default when dealing with boolean parameters.
-        return sValue == 'True' or sValue == 'true' or sValue == '1';
+        return sValue in ('True', 'true', '1',);
 
     def getIntParam(self, sName, iMin = None, iMax = None, iDefault = None):
@@ -547 +547 @@
             oListEntryTestCaseArgs = []
             for idTestCaseArgs in aiAllTestCaseArgs:
-                fArgsChecked   = True if idTestCaseArgs in aiCheckedTestCaseArgs else False
+                fArgsChecked   = idTestCaseArgs in aiCheckedTestCaseArgs;
 
                 # Dry run
@@ -562 +562 @@
             sTestCaseName = self.getStringParam('%s[%d][sName]' % (sName, idTestCase), sDefault='')
 
-            oListEntryTestCase = \
-                (idTestCase,
-                 True if idTestCase in aiSelectedTestCaseIds else False,
-                 sTestCaseName,
-                 oListEntryTestCaseArgs)
+            oListEntryTestCase = (
+                idTestCase,
+                idTestCase in aiSelectedTestCaseIds,
+                sTestCaseName,
+                oListEntryTestCaseArgs
+            );
 
             aoListOfTestCases.append(oListEntryTestCase)

trunk/src/VBox/ValidationKit/testmanager/webui/wuicontentbase.py

@@ -54 +54 @@
     def __init__(self):
         """Dummy init to shut up pylint."""
-        pass;
+        pass;                               # pylint: disable=unnecessary-pass
 
     def toHtml(self):
@@ -732 +732 @@
         aoRet = []
         for sListItem in asListItems:
-            fEnabled = True if sListItem in asSelectedItems else False
+            fEnabled = sListItem in asSelectedItems;
             aoRet.append((sListItem, fEnabled, sListItem))
         return aoRet

trunk/src/VBox/ValidationKit/testmanager/webui/wuigraphwiz.py

@@ -205 +205 @@
         # Must be at least two series for something to be splittable.
         if len(aoSeries) <= 1:
-            if len(aoSeries) < 1:
+            if not aoSeries:
                 return [];
             return [aoSeries,];

trunk/src/VBox/ValidationKit/testmanager/webui/wuihlpgraphgooglechart.py

@@ -42 +42 @@
 class WuiHlpGraphGoogleChartsBase(WuiHlpGraphBase):
     """ Base class for the Google Charts graphs. """
-    pass;
+    pass;                               # pylint: disable=unnecessary-pass
 
 

trunk/src/VBox/ValidationKit/testmanager/webui/wuihlpgraphmatplotlib.py

@@ -33 +33 @@
 import sys;
 if sys.version_info[0] >= 3:
-    from io       import StringIO as StringIO;  # pylint: disable=import-error,no-name-in-module
+    from io       import StringIO as StringIO;  # pylint: disable=import-error,no-name-in-module,useless-import-alias
 else:
-    from StringIO import StringIO as StringIO;  # pylint: disable=import-error,no-name-in-module
+    from StringIO import StringIO as StringIO;  # pylint: disable=import-error,no-name-in-module,useless-import-alias
 
 import matplotlib;                              # pylint: disable=import-error

trunk/src/VBox/ValidationKit/testmanager/webui/wuihlpgraphsimple.py

@@ -148 +148 @@
     """
 
-    pass;
+    pass;                               # pylint: disable=unnecessary-pass
 

trunk/src/VBox/ValidationKit/testmanager/webui/wuimain.py

@@ -759 +759 @@
         oTrLogic = TestResultLogic(self._oDb);
         sAltSelectorAction = None;
-        if   enmResultsGroupingType == TestResultLogic.ksResultsGroupingTypeNone \
-          or enmResultsGroupingType == TestResultLogic.ksResultsGroupingTypeTestBox:
+        if enmResultsGroupingType in (TestResultLogic.ksResultsGroupingTypeNone, TestResultLogic.ksResultsGroupingTypeTestBox,):
             aoTmp = oTrLogic.getTestBoxes(tsNow = tsEffective, sPeriod = sCurPeriod)
-            aoGroupMembers = sorted(list(set([ (x.idTestBox, '%s (%s)' % (x.sName, str(x.ip))) for x in aoTmp ])),
+            aoGroupMembers = sorted(list({(x.idTestBox, '%s (%s)' % (x.sName, str(x.ip))) for x in aoTmp }),
                                     reverse = False, key = lambda asData: asData[1])
 
@@ -774 +773 @@
         elif enmResultsGroupingType == TestResultLogic.ksResultsGroupingTypeTestGroup:
             aoTmp = oTrLogic.getTestGroups(tsNow = tsEffective, sPeriod = sCurPeriod);
-            aoGroupMembers = sorted(list(set([ (x.idTestGroup, x.sName ) for x in aoTmp ])),
+            aoGroupMembers = sorted(list({ (x.idTestGroup, x.sName ) for x in aoTmp }),
                                     reverse = False, key = lambda asData: asData[1])
             self._sPageTitle = 'Grouped by Test Group'
@@ -780 +779 @@
         elif enmResultsGroupingType == TestResultLogic.ksResultsGroupingTypeBuildRev:
             aoTmp = oTrLogic.getBuilds(tsNow = tsEffective, sPeriod = sCurPeriod)
-            aoGroupMembers = sorted(list(set([ (x.iRevision, '%s.%d' % (x.oCat.sBranch, x.iRevision)) for x in aoTmp ])),
+            aoGroupMembers = sorted(list({ (x.iRevision, '%s.%d' % (x.oCat.sBranch, x.iRevision)) for x in aoTmp }),
                                     reverse = True, key = lambda asData: asData[0])
             self._sPageTitle = 'Grouped by Build'
@@ -786 +785 @@
         elif enmResultsGroupingType == TestResultLogic.ksResultsGroupingTypeBuildCat:
             aoTmp = oTrLogic.getBuildCategories(tsNow = tsEffective, sPeriod = sCurPeriod)
-            aoGroupMembers = sorted(list(set([ ( x.idBuildCategory, '%s / %s / %s / %s'
-                                                 % ( x.sProduct, x.sBranch, ', '.join(x.asOsArches), x.sType) )
-                                               for x in aoTmp ])),
+            aoGroupMembers = sorted(list({ (x.idBuildCategory,
+                                            '%s / %s / %s / %s' % ( x.sProduct, x.sBranch, ', '.join(x.asOsArches), x.sType) )
+                                           for x in aoTmp }),
                                     reverse = True, key = lambda asData: asData[1]);
             self._sPageTitle = 'Grouped by Build Category'
@@ -794 +793 @@
         elif enmResultsGroupingType == TestResultLogic.ksResultsGroupingTypeTestCase:
             aoTmp = oTrLogic.getTestCases(tsNow = tsEffective, sPeriod = sCurPeriod)
-            aoGroupMembers = sorted(list(set([ (x.idTestCase, '%s' % x.sName) for x in aoTmp ])),
+            aoGroupMembers = sorted(list({ (x.idTestCase, '%s' % x.sName) for x in aoTmp }),
                                     reverse = False, key = lambda asData: asData[1])
             self._sPageTitle = 'Grouped by Test Case'
@@ -810 +809 @@
         elif enmResultsGroupingType == TestResultLogic.ksResultsGroupingTypeSchedGroup:
             aoTmp = oTrLogic.getSchedGroups(tsNow = tsEffective, sPeriod = sCurPeriod)
-            aoGroupMembers = sorted(list(set([ (x.idSchedGroup, '%s' % x.sName) for x in aoTmp ])),
+            aoGroupMembers = sorted(list({ (x.idSchedGroup, '%s' % x.sName) for x in aoTmp }),
                                     reverse = False, key = lambda asData: asData[1])
             self._sPageTitle = 'Grouped by Scheduling Group'

trunk/src/VBox/ValidationKit/testmanager/webui/wuireport.py

@@ -91 +91 @@
         Returns HTML.
         """
-        assert sWhere == 'top' or sWhere == 'bottom';
+        assert sWhere in ('top', 'bottom',);
 
         return '';