Changeset 87678 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

Feb 10, 2021 12:09:44 PM (4 years ago)

Author:

vboxsync

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

142720

Message:

Main: bugref:9224: Testcase: fixed pylint issues

File:

• trunk/src/VBox/ValidationKit/tests/storage/tdStorageRawDrive1.py (modified) (14 diffs)

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

@@ -984 +984 @@
                 # pylint: disable=no-init
                 class ParseState(object):
-                    Nothing   = 0;
-                    Drive     = 1;
-                    Partition = 2;
-
-                iParseState = ParseState.Nothing;
+                    kiNothing   = 0;
+                    kikDrive    = 1;
+                    kiPartition = 2;
+
+                iParseState = ParseState.kiNothing;
                 asKeysNotFound = asHddData['Header'].keys();
                 idxPartition = 0;
@@ -1003 +1003 @@
                                 break;
                             sDrive = sValue;
-                            iParseState = ParseState.Drive;
+                            iParseState = ParseState.kiDrive;
                             asKeysNotFound = asKeysNotFound = asHddData['Header'].keys();
                             idxPartition = 0;
                             continue;
-                    if iParseState == ParseState.Drive:
+                    if iParseState == ParseState.kiDrive:
                         if sLine.strip().startswith('Partitions:'):
-                            iParseState = ParseState.Partition;
+                            iParseState = ParseState.kiPartition;
                             continue;
                         if oMatch is None or sKey is None:
@@ -1016 +1016 @@
                             asKeysNotFound.remove(sKey);
                         continue;
-                    if iParseState == ParseState.Partition:
+                    if iParseState == ParseState.kiPartition:
                         if idxPartition < len(asHddData['Partitions']['Partitions']):
                             sPart = asHddData['Partitions']['Partitions'][idxPartition];
@@ -1048 +1048 @@
         # pylint: disable=no-init
         class DescriptorParseState(object):
-            Header   = 1;
-            Extent   = 2;
-            Database = 3;
+            kiHeader   = 1;
+            kiExtent   = 2;
+            kiDatabase = 3;
 
         asHddData = self.asHdds[sHdd];
-        iParseState = DescriptorParseState.Header;
+        iParseState = DescriptorParseState.kiHeader;
 
         asHeader = { 'version'    : '1',
@@ -1076 +1076 @@
                 continue;
 
-            if iParseState == DescriptorParseState.Header:
+            if iParseState == DescriptorParseState.kiHeader:
                 if sLine.startswith('ddb.'):
                     return reporter.error("VMDK descriptor has invalid order of sections");
@@ -1082 +1082 @@
                    or sLine.startswith("RDONLY") \
                    or sLine.startswith("NOACCESS"):
-                    iParseState = DescriptorParseState.Extent;
+                    iParseState = DescriptorParseState.kiExtent;
                 else:
                     oMatch = oRegExp.match(sLine);
@@ -1098 +1098 @@
                     continue;
 
-            if iParseState == DescriptorParseState.Extent:
+            if iParseState == DescriptorParseState.kiExtent:
                 if sLine.startswith('ddb.'):
-                    iParseState = DescriptorParseState.Database;
+                    iParseState = DescriptorParseState.kiDatabase;
                 else:
                     if     not sLine.startswith("RW")     \
@@ -1117 +1117 @@
                     continue;
 
-            if iParseState == DescriptorParseState.Database:
+            if iParseState == DescriptorParseState.kiDatabase:
                 if not sLine.startswith('ddb.'):
                     return reporter.error("VMDK descriptor has invalid order of sections");
@@ -1131 +1131 @@
                     return reporter.error("VMDK descriptor has value which was not expected");
                 continue;
-        return iParseState == DescriptorParseState.Database;
+        return iParseState == DescriptorParseState.kiDatabase;
 
     def _setPermissionsToVmdkFiles(self, oGuestSession):
@@ -1152 +1152 @@
         asHddData = self.asHdds[sHdd];
         fRc = True;
-        try:    oGuestSession.directoryCreate(self.sVMDKPath, 0777, (vboxcon.DirectoryCreateFlag_Parents,));
+        try:    oGuestSession.directoryCreate(self.sVMDKPath, 777, (vboxcon.DirectoryCreateFlag_Parents,));
         except: fRc = reporter.errorXcpt('Create directory for VMDK files failed in the VM %s' % (self.sVmName));
         if fRc:
@@ -1555 +1555 @@
     ksOsSolaris = 'tst-solaris';
     ksOsFreeBSD = 'tst-freebsd';
-    BootSectorPath = '6.1/storage/t-bootsector.bin';
-    asHdds = ['6.1/storage/t-gpt.vdi', '6.1/storage/t-mbr.vdi'];
+    ksBootSectorPath = '6.1/storage/t-bootsector.bin';
+    kasHdds = ['6.1/storage/t-gpt.vdi', '6.1/storage/t-mbr.vdi'];
 
     def __init__(self):
@@ -1572 +1572 @@
                              '6.0/windows7piglit/windows7piglit.vdi', eNic0Type = None, cMbRam = 2048,  \
                              cCpus = 2, fPae = True, sGuestAdditionsIso = self.getGuestAdditionsIso(),
-                             sBootSector = self.BootSectorPath),
+                             sBootSector = self.ksBootSectorPath),
             'linux'   : tdStorageRawDriveOsLinux(oSet, self, self.ksOsLinux, 'Ubuntu_64', \
                                '6.0/ub1804piglit/ub1804piglit.vdi', eNic0Type = None, \
                                cMbRam = 2048, cCpus = 2, fPae = None, sGuestAdditionsIso = self.getGuestAdditionsIso(),
-                               sBootSector = self.BootSectorPath),
+                               sBootSector = self.ksBootSectorPath),
             'solaris' : None, #'tdAutostartOsSolaris',
             'darwin'  : None  #'tdAutostartOsDarwin'
@@ -1629 +1629 @@
 
     def getResourceSet(self):
-        asRsrcs = self.asHdds[:];
-        asRsrcs.extend([self.BootSectorPath,]);
+        asRsrcs = self.kasHdds[:];
+        asRsrcs.extend([self.ksBootSectorPath,]);
         asRsrcs.extend(vbox.TestDriver.getResourceSet(self));
         return asRsrcs;
@@ -1652 +1652 @@
         self.logVmInfo(oVM);
 
-        for sHdd in self.asHdds:
+        for sHdd in self.kasHdds:
             reporter.testStart('%s with %s disk' % ( oTestVm.sVmName, sHdd))
-            fRc = oTestVm.reattachHdd(oVM, sHdd, self.asHdds);
+            fRc = oTestVm.reattachHdd(oVM, sHdd, self.kasHdds);
             if fRc:
                 oSession = self.startVmByName(oTestVm.sVmName);