Skip to content

Commit c1d2b3b

Browse files
bird2toribird2tori
committed
ValKit: pylint 3.3.7 adjustments.
svn:sync-xref-src-repo-rev: r173140
1 parent 8798fe1 commit c1d2b3b

7 files changed

Lines changed: 54 additions & 62 deletions

File tree

‎src/VBox/ValidationKit/testdriver/vboxtestfileset.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*- coding: utf-8 -*-
2-
# $Id: vboxtestfileset.py 112403 2026-01-11 19:29:08Z knut.osmundsen@oracle.com $
2+
# $Id: vboxtestfileset.py 113386 2026-03-13 12:55:16Z knut.osmundsen@oracle.com $
33
# pylint: disable=too-many-lines
44

55
"""
@@ -37,7 +37,7 @@
3737
3838
SPDX-License-Identifier: GPL-3.0-only OR CDDL-1.0
3939
"""
40-
__version__ = "$Revision: 112403 $"
40+
__version__ = "$Revision: 113386 $"
4141

4242

4343
# Standard Python imports.
@@ -67,7 +67,7 @@ class TestFileSet(testfileset.TestFileSet):
6767
utility from the validation kit.
6868
"""
6969

70-
def __init__(self, oTestVm, sBasePath, sSubDir, # pylint: disable=too-many-arguments
70+
def __init__(self, oTestVm, sBasePath, sSubDir, # pylint: disable=too-many-arguments,too-many-positional-arguments
7171
oRngFileSizes = xrange(0, 16384),
7272
oRngManyFiles = xrange(128, 512),
7373
oRngTreeFiles = xrange(128, 384),

‎src/VBox/ValidationKit/testmanager/core/base.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*- coding: utf-8 -*-
2-
# $Id: base.py 112403 2026-01-11 19:29:08Z knut.osmundsen@oracle.com $
2+
# $Id: base.py 113386 2026-03-13 12:55:16Z knut.osmundsen@oracle.com $
33
# pylint: disable=too-many-lines
44

55
"""
@@ -37,7 +37,7 @@
3737
3838
SPDX-License-Identifier: GPL-3.0-only OR CDDL-1.0
3939
"""
40-
__version__ = "$Revision: 112403 $"
40+
__version__ = "$Revision: 113386 $"
4141

4242

4343
# Standard python imports.
@@ -1301,8 +1301,8 @@ class FilterCriterion(object):
13011301
ksType_Ranges = 'ranges'; ##< List of (unsigned) integer ranges.
13021302
## @}
13031303

1304-
def __init__(self, sName, sVarNm = None, sType = ksType_UInt, # pylint: disable=too-many-arguments
1305-
sState = ksState_NotSelected, sKind = ksKind_ElementOfOrNot,
1304+
def __init__(self, sName, sVarNm = None, # pylint: disable=too-many-arguments,too-many-positional-arguments
1305+
sType = ksType_UInt, sState = ksState_NotSelected, sKind = ksKind_ElementOfOrNot,
13061306
sTable = None, sColumn = None, asTables = None, oSub = None):
13071307
assert len(sVarNm) == 2; # required by wuimain.py for filtering.
13081308
self.sName = sName;

‎src/VBox/ValidationKit/testmanager/core/testcaseargs.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*- coding: utf-8 -*-
2-
# $Id: testcaseargs.py 112403 2026-01-11 19:29:08Z knut.osmundsen@oracle.com $
2+
# $Id: testcaseargs.py 113386 2026-03-13 12:55:16Z knut.osmundsen@oracle.com $
33

44
"""
55
Test Manager - Test Case Arguments Variations.
@@ -36,7 +36,7 @@
3636
3737
SPDX-License-Identifier: GPL-3.0-only OR CDDL-1.0
3838
"""
39-
__version__ = "$Revision: 112403 $"
39+
__version__ = "$Revision: 113386 $"
4040

4141

4242
# Standard python imports.
@@ -146,9 +146,9 @@ def initFromDbWithGenId(self, oDb, idGenTestCaseArgs):
146146
oDb.execute('SELECT * FROM TestCaseArgs WHERE idGenTestCaseArgs = %s', (idGenTestCaseArgs,));
147147
return self.initFromDbRow(oDb.fetchOne());
148148

149-
def initFromValues(self, sArgs, cSecTimeout = None, sTestBoxReqExpr = None, sBuildReqExpr = None, # pylint: disable=too-many-arguments
150-
cGangMembers = 1, idTestCase = None, idTestCaseArgs = None, tsEffective = None, tsExpire = None,
151-
uidAuthor = None, idGenTestCaseArgs = None, sSubName = None):
149+
def initFromValues(self, sArgs, cSecTimeout = None, # pylint: disable=too-many-arguments,too-many-positional-arguments
150+
sTestBoxReqExpr = None, sBuildReqExpr = None, cGangMembers = 1, idTestCase = None, idTestCaseArgs = None,
151+
tsEffective = None, tsExpire = None, uidAuthor = None, idGenTestCaseArgs = None, sSubName = None):
152152
"""
153153
Reinitialize from values.
154154
Returns self.

‎src/VBox/ValidationKit/testmanager/core/testresults.py‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*- coding: utf-8 -*-
2-
# $Id: testresults.py 112403 2026-01-11 19:29:08Z knut.osmundsen@oracle.com $
2+
# $Id: testresults.py 113386 2026-03-13 12:55:16Z knut.osmundsen@oracle.com $
33
# pylint: disable=too-many-lines
44

55
## @todo Rename this file to testresult.py!
@@ -39,7 +39,7 @@
3939
4040
SPDX-License-Identifier: GPL-3.0-only OR CDDL-1.0
4141
"""
42-
__version__ = "$Revision: 112403 $"
42+
__version__ = "$Revision: 113386 $"
4343

4444

4545
# Standard python imports.
@@ -1269,8 +1269,9 @@ def _getTimePeriodQueryPart(self, tsNow, sInterval, sExtraIndent = ''):
12691269
sExtraIndent, sTsNow, sInterval );
12701270
return sRet
12711271

1272-
def fetchResultsForListing(self, iStart, cMaxRows, tsNow, sInterval, oFilter, enmResultSortBy, # pylint: disable=too-many-arguments
1273-
enmResultsGroupingType, iResultsGroupingValue, fOnlyFailures, fOnlyNeedingReason):
1272+
def fetchResultsForListing(self, iStart, cMaxRows, tsNow, # pylint: disable=too-many-arguments,too-many-positional-arguments
1273+
sInterval, oFilter, enmResultSortBy, enmResultsGroupingType, iResultsGroupingValue,
1274+
fOnlyFailures, fOnlyNeedingReason):
12741275
"""
12751276
Fetches TestResults table content.
12761277

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*- coding: utf-8 -*-
2-
# $Id: wuicontentbase.py 112403 2026-01-11 19:29:08Z knut.osmundsen@oracle.com $
2+
# $Id: wuicontentbase.py 113386 2026-03-13 12:55:16Z knut.osmundsen@oracle.com $
33

44
"""
55
Test Manager Web-UI - Content Base Classes.
@@ -36,7 +36,7 @@
3636
3737
SPDX-License-Identifier: GPL-3.0-only OR CDDL-1.0
3838
"""
39-
__version__ = "$Revision: 112403 $"
39+
__version__ = "$Revision: 113386 $"
4040

4141

4242
# Standard python imports.
@@ -815,8 +815,9 @@ class WuiListContentBase(WuiContentBase):
815815
Base for the list content classes.
816816
"""
817817

818-
def __init__(self, aoEntries, iPage, cItemsPerPage, tsEffectiveDate, sTitle, # pylint: disable=too-many-arguments
819-
sId = None, fnDPrint = None, oDisp = None, aiSelectedSortColumns = None, fTimeNavigation = True):
818+
def __init__(self, aoEntries, iPage, cItemsPerPage, # pylint: disable=too-many-arguments,too-many-positional-arguments
819+
tsEffectiveDate, sTitle, sId = None, fnDPrint = None, oDisp = None, aiSelectedSortColumns = None,
820+
fTimeNavigation = True):
820821
WuiContentBase.__init__(self, fnDPrint = fnDPrint, oDisp = oDisp);
821822
self._aoEntries = aoEntries; ## @todo should replace this with a Logic object and define methods for querying.
822823
self._iPage = iPage;
@@ -1230,8 +1231,8 @@ class WuiListContentWithActionBase(WuiListContentBase):
12301231
Base for the list content with action classes.
12311232
"""
12321233

1233-
def __init__(self, aoEntries, iPage, cItemsPerPage, tsEffectiveDate, sTitle, # pylint: disable=too-many-arguments
1234-
sId = None, fnDPrint = None, oDisp = None, aiSelectedSortColumns = None):
1234+
def __init__(self, aoEntries, iPage, cItemsPerPage, # pylint: disable=too-many-arguments,too-many-positional-arguments
1235+
tsEffectiveDate, sTitle, sId = None, fnDPrint = None, oDisp = None, aiSelectedSortColumns = None):
12351236
WuiListContentBase.__init__(self, aoEntries, iPage, cItemsPerPage, tsEffectiveDate, sTitle, sId = sId,
12361237
fnDPrint = fnDPrint, oDisp = oDisp, aiSelectedSortColumns = aiSelectedSortColumns);
12371238
self._aoActions = None; # List of [ oValue, sText, sHover ] provided by the child class.

‎src/VBox/ValidationKit/tests/autostart/tdAutostart1.py‎

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
3636
SPDX-License-Identifier: GPL-3.0-only OR CDDL-1.0
3737
"""
38-
__version__ = "$Id: tdAutostart1.py 112403 2026-01-11 19:29:08Z knut.osmundsen@oracle.com $"
38+
__version__ = "$Id: tdAutostart1.py 113386 2026-03-13 12:55:16Z knut.osmundsen@oracle.com $"
3939

4040
# Standard Python imports.
4141
import os;
@@ -100,9 +100,8 @@ class tdAutostartOs(vboxtestvms.BaseTestVm):
100100
"""
101101
Base autostart helper class to provide common methods.
102102
"""
103-
# pylint: disable=too-many-arguments
104-
def __init__(self, oSet, oTstDrv, sVmName, sKind, sHdd, eNic0Type = None, cMbRam = None, \
105-
cCpus = 1, fPae = None, sGuestAdditionsIso = None):
103+
def __init__(self, oSet, oTstDrv, sVmName, sKind, sHdd, # pylint: disable=too-many-arguments,too-many-positional-arguments
104+
eNic0Type = None, cMbRam = None, cCpus = 1, fPae = None, sGuestAdditionsIso = None):
106105
vboxtestvms.BaseTestVm.__init__(self, sVmName, oSet = oSet, sKind = sKind);
107106
self.oTstDrv = oTstDrv;
108107
self.sHdd = sHdd;
@@ -656,10 +655,9 @@ class tdAutostartOsLinux(tdAutostartOs):
656655
"""
657656
Autostart support methods for Linux guests.
658657
"""
659-
# pylint: disable=too-many-arguments
660-
def __init__(self, oSet, oTstDrv, sVmName, sKind, sHdd, eNic0Type = None, cMbRam = None, \
661-
cCpus = 1, fPae = None, sGuestAdditionsIso = None):
662-
tdAutostartOs.__init__(self, oSet, oTstDrv, sVmName, sKind, sHdd, eNic0Type, cMbRam, \
658+
def __init__(self, oSet, oTstDrv, sVmName, sKind, sHdd, # pylint: disable=too-many-arguments,too-many-positional-arguments
659+
eNic0Type = None, cMbRam = None, cCpus = 1, fPae = None, sGuestAdditionsIso = None):
660+
tdAutostartOs.__init__(self, oSet, oTstDrv, sVmName, sKind, sHdd, eNic0Type, cMbRam,
663661
cCpus, fPae, sGuestAdditionsIso);
664662
try: self.sVBoxInstaller = '^VirtualBox-.*\\.run$';
665663
except: pass;
@@ -912,32 +910,29 @@ class tdAutostartOsDarwin(tdAutostartOs):
912910
"""
913911
Autostart support methods for Darwin guests.
914912
"""
915-
# pylint: disable=too-many-arguments
916-
def __init__(self, oSet, oTstDrv, sVmName, sKind, sHdd, eNic0Type = None, cMbRam = None, \
917-
cCpus = 1, fPae = None, sGuestAdditionsIso = None):
918-
tdAutostartOs.__init__(self, oSet, oTstDrv, sVmName, sKind, sHdd, eNic0Type, cMbRam, \
913+
def __init__(self, oSet, oTstDrv, sVmName, sKind, sHdd, # pylint: disable=too-many-arguments,too-many-positional-arguments
914+
eNic0Type = None, cMbRam = None, cCpus = 1, fPae = None, sGuestAdditionsIso = None):
915+
tdAutostartOs.__init__(self, oSet, oTstDrv, sVmName, sKind, sHdd, eNic0Type, cMbRam,
919916
cCpus, fPae, sGuestAdditionsIso);
920917
raise base.GenError('Testing the autostart functionality for Darwin is not implemented');
921918

922919
class tdAutostartOsSolaris(tdAutostartOs):
923920
"""
924921
Autostart support methods for Solaris guests.
925922
"""
926-
# pylint: disable=too-many-arguments
927-
def __init__(self, oSet, oTstDrv, sVmName, sKind, sHdd, eNic0Type = None, cMbRam = None, \
928-
cCpus = 1, fPae = None, sGuestAdditionsIso = None):
929-
tdAutostartOs.__init__(self, oSet, oTstDrv, sVmName, sKind, sHdd, eNic0Type, cMbRam, \
923+
def __init__(self, oSet, oTstDrv, sVmName, sKind, sHdd, # pylint: disable=too-many-arguments,too-many-positional-arguments
924+
eNic0Type = None, cMbRam = None, cCpus = 1, fPae = None, sGuestAdditionsIso = None):
925+
tdAutostartOs.__init__(self, oSet, oTstDrv, sVmName, sKind, sHdd, eNic0Type, cMbRam,
930926
cCpus, fPae, sGuestAdditionsIso);
931927
raise base.GenError('Testing the autostart functionality for Solaris is not implemented');
932928

933929
class tdAutostartOsWin(tdAutostartOs):
934930
"""
935931
Autostart support methods for Windows guests.
936932
"""
937-
# pylint: disable=too-many-arguments
938-
def __init__(self, oSet, oTstDrv, sVmName, sKind, sHdd, eNic0Type = None, cMbRam = None, \
939-
cCpus = 1, fPae = None, sGuestAdditionsIso = None):
940-
tdAutostartOs.__init__(self, oSet, oTstDrv, sVmName, sKind, sHdd, eNic0Type, cMbRam, \
933+
def __init__(self, oSet, oTstDrv, sVmName, sKind, sHdd, # pylint: disable=too-many-arguments,too-many-positional-arguments
934+
eNic0Type = None, cMbRam = None, cCpus = 1, fPae = None, sGuestAdditionsIso = None):
935+
tdAutostartOs.__init__(self, oSet, oTstDrv, sVmName, sKind, sHdd, eNic0Type, cMbRam,
941936
cCpus, fPae, sGuestAdditionsIso);
942937
try: self.sVBoxInstaller = '^VirtualBox-.*\\.(exe|msi)$';
943938
except: pass;

‎src/VBox/ValidationKit/tests/storage/tdStorageRawDrive1.py‎

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
3737
SPDX-License-Identifier: GPL-3.0-only OR CDDL-1.0
3838
"""
39-
__version__ = "$Id: tdStorageRawDrive1.py 112403 2026-01-11 19:29:08Z knut.osmundsen@oracle.com $"
39+
__version__ = "$Id: tdStorageRawDrive1.py 113386 2026-03-13 12:55:16Z knut.osmundsen@oracle.com $"
4040

4141
# Standard Python imports.
4242
import os;
@@ -63,9 +63,8 @@ class tdStorageRawDriveOs(vboxtestvms.BaseTestVm):
6363
"""
6464
Base autostart helper class to provide common methods.
6565
"""
66-
# pylint: disable=too-many-arguments
67-
def __init__(self, oSet, oTstDrv, sVmName, sKind, sHdd, eNic0Type = None, cMbRam = None, \
68-
cCpus = 1, fPae = None, sGuestAdditionsIso = None, sBootSector = None):
66+
def __init__(self, oSet, oTstDrv, sVmName, sKind, sHdd, # pylint: disable=too-many-arguments,too-many-positional-arguments
67+
eNic0Type = None, cMbRam = None, cCpus = 1, fPae = None, sGuestAdditionsIso = None, sBootSector = None):
6968
vboxtestvms.BaseTestVm.__init__(self, sVmName, oSet = oSet, sKind = sKind);
7069
self.oTstDrv = oTstDrv;
7170
self.sHdd = sHdd;
@@ -1234,10 +1233,9 @@ class tdStorageRawDriveOsLinux(tdStorageRawDriveOs):
12341233
"""
12351234
Autostart support methods for Linux guests.
12361235
"""
1237-
# pylint: disable=too-many-arguments
1238-
def __init__(self, oSet, oTstDrv, sVmName, sKind, sHdd, eNic0Type = None, cMbRam = None, \
1239-
cCpus = 1, fPae = None, sGuestAdditionsIso = None, sBootSector = None):
1240-
tdStorageRawDriveOs.__init__(self, oSet, oTstDrv, sVmName, sKind, sHdd, eNic0Type, cMbRam, \
1236+
def __init__(self, oSet, oTstDrv, sVmName, sKind, sHdd, # pylint: disable=too-many-arguments,too-many-positional-arguments
1237+
eNic0Type = None, cMbRam = None, cCpus = 1, fPae = None, sGuestAdditionsIso = None, sBootSector = None):
1238+
tdStorageRawDriveOs.__init__(self, oSet, oTstDrv, sVmName, sKind, sHdd, eNic0Type, cMbRam,
12411239
cCpus, fPae, sGuestAdditionsIso, sBootSector);
12421240
self.sVBoxInstaller = '^VirtualBox-.*\\.run$';
12431241
return;
@@ -1358,32 +1356,29 @@ class tdStorageRawDriveOsDarwin(tdStorageRawDriveOs):
13581356
"""
13591357
Autostart support methods for Darwin guests.
13601358
"""
1361-
# pylint: disable=too-many-arguments
1362-
def __init__(self, oSet, oTstDrv, sVmName, sKind, sHdd, eNic0Type = None, cMbRam = None, \
1363-
cCpus = 1, fPae = None, sGuestAdditionsIso = None, sBootSector = None):
1364-
tdStorageRawDriveOs.__init__(self, oSet, oTstDrv, sVmName, sKind, sHdd, eNic0Type, cMbRam, \
1359+
def __init__(self, oSet, oTstDrv, sVmName, sKind, sHdd, # pylint: disable=too-many-arguments,too-many-positional-arguments
1360+
eNic0Type = None, cMbRam = None, cCpus = 1, fPae = None, sGuestAdditionsIso = None, sBootSector = None):
1361+
tdStorageRawDriveOs.__init__(self, oSet, oTstDrv, sVmName, sKind, sHdd, eNic0Type, cMbRam,
13651362
cCpus, fPae, sGuestAdditionsIso, sBootSector);
13661363
raise base.GenError('Testing the autostart functionality for Darwin is not implemented');
13671364

13681365
class tdStorageRawDriveOsSolaris(tdStorageRawDriveOs):
13691366
"""
13701367
Autostart support methods for Solaris guests.
13711368
"""
1372-
# pylint: disable=too-many-arguments
1373-
def __init__(self, oSet, oTstDrv, sVmName, sKind, sHdd, eNic0Type = None, cMbRam = None, \
1374-
cCpus = 1, fPae = None, sGuestAdditionsIso = None, sBootSector = None):
1375-
tdStorageRawDriveOs.__init__(self, oSet, oTstDrv, sVmName, sKind, sHdd, eNic0Type, cMbRam, \
1369+
def __init__(self, oSet, oTstDrv, sVmName, sKind, sHdd, # pylint: disable=too-many-arguments,too-many-positional-arguments
1370+
eNic0Type = None, cMbRam = None, cCpus = 1, fPae = None, sGuestAdditionsIso = None, sBootSector = None):
1371+
tdStorageRawDriveOs.__init__(self, oSet, oTstDrv, sVmName, sKind, sHdd, eNic0Type, cMbRam,
13761372
cCpus, fPae, sGuestAdditionsIso, sBootSector);
13771373
raise base.GenError('Testing the autostart functionality for Solaris is not implemented');
13781374

13791375
class tdStorageRawDriveOsWin(tdStorageRawDriveOs):
13801376
"""
13811377
Autostart support methods for Windows guests.
13821378
"""
1383-
# pylint: disable=too-many-arguments
1384-
def __init__(self, oSet, oTstDrv, sVmName, sKind, sHdd, eNic0Type = None, cMbRam = None, \
1385-
cCpus = 1, fPae = None, sGuestAdditionsIso = None, sBootSector = None):
1386-
tdStorageRawDriveOs.__init__(self, oSet, oTstDrv, sVmName, sKind, sHdd, eNic0Type, cMbRam, \
1379+
def __init__(self, oSet, oTstDrv, sVmName, sKind, sHdd, # pylint: disable=too-many-arguments,too-many-positional-arguments
1380+
eNic0Type = None, cMbRam = None, cCpus = 1, fPae = None, sGuestAdditionsIso = None, sBootSector = None):
1381+
tdStorageRawDriveOs.__init__(self, oSet, oTstDrv, sVmName, sKind, sHdd, eNic0Type, cMbRam,
13871382
cCpus, fPae, sGuestAdditionsIso, sBootSector);
13881383
self.sVBoxInstaller = r'^VirtualBox-.*\.(exe|msi)$';
13891384
self.sVMDKPath=r'C:\Temp\vmdk';

0 commit comments

Comments
 (0)