Changeset 70660 in vbox for trunk/src/VBox/ValidationKit/tests

Timestamp:

Jan 21, 2018 4:18:58 PM (7 years ago)

Author:

vboxsync

Message:

ValidationKit: Python 3 and pylint 1.8.1 adjustments/fixes.

Location:

trunk/src/VBox/ValidationKit/tests

Files:

• additions/tdAddGuestCtrl.py (modified) (6 diffs)
• api/tdPython1.py (modified) (3 diffs)
• storage/remoteexecutor.py (modified) (2 diffs)
• storage/storagecfg.py (modified) (4 diffs)
• storage/tdStorageBenchmark1.py (modified) (3 diffs)
• usb/tst-utsgadget.py (modified) (4 diffs)
• usb/usbgadget.py (modified) (6 diffs)

trunk/src/VBox/ValidationKit/tests/additions/tdAddGuestCtrl.py

@@ -3168 +3168 @@
             curTest = aTest[0]; # tdTestFileReadWrite, use an index, later.
             curRes  = aTest[1]; # tdTestResult
-            reporter.log('Testing #%d, sFile="%s", cbToReadWrite=%d, sOpenMode="%s", sDisposition="%s", cbOffset=%d ...' % \
+            reporter.log('Testing #%d, sFile="%s", cbToReadWrite=%d, sOpenMode="%s", sDisposition="%s", cbOffset=%d ...' %
                          (i, curTest.sFile, curTest.cbToReadWrite, curTest.sOpenMode, curTest.sDisposition, curTest.cbOffset));
             curTest.setEnvironment(oSession, oTxsSession, oTestVm);
@@ -3175 +3175 @@
                 reporter.error('Test #%d failed: Could not create session' % (i,));
                 break;
+
             try:
                 if curTest.cbOffset > 0: # The offset parameter is gone.
@@ -3182 +3183 @@
                         curFile.seek(curTest.cbOffset, vboxcon.FileSeekOrigin_Begin);
                     else:
-                        curFile = curGuestSession.fileOpenEx(curTest.sFile, curTest.sOpenMode, curTest.sDisposition, \
+                        curFile = curGuestSession.fileOpenEx(curTest.sFile, curTest.sOpenMode, curTest.sDisposition,
                                                              curTest.sSharingMode, curTest.lCreationMode, curTest.cbOffset);
                     curOffset = long(curFile.offset);
                     resOffset = long(curTest.cbOffset);
                     if curOffset != resOffset:
-                        reporter.error('Test #%d failed: Initial offset on open does not match: Got %d, expected %d' \
+                        reporter.error('Test #%d failed: Initial offset on open does not match: Got %d, expected %d'
                                        % (i, curOffset, resOffset));
                         fRc = False;
@@ -3195 +3196 @@
                                                            curTest.lCreationMode);
                     else:
-                        curFile = curGuestSession.fileOpen(curTest.sFile, curTest.sOpenMode, curTest.sDisposition, \
+                        curFile = curGuestSession.fileOpen(curTest.sFile, curTest.sOpenMode, curTest.sDisposition,
                                                            curTest.lCreationMode);
-                if  fRc \
-                and curTest.cbToReadWrite > 0:
+                if fRc and curTest.cbToReadWrite > 0:
                     ## @todo Split this up in 64K writes. Later.
                     ## @todo Test timeouts.
                     cBytesWritten = curFile.write(curTest.aBuf, 30 * 1000);
-                    if  curRes.cbProcessed > 0 \
-                    and curRes.cbProcessed != cBytesWritten:
-                        reporter.error('Test #%d failed: Written buffer length does not match: Got %d, expected %d' \
+                    if    curRes.cbProcessed > 0 \
+                      and curRes.cbProcessed != cBytesWritten:
+                        reporter.error('Test #%d failed: Written buffer length does not match: Got %d, expected %d'
                                        % (i, cBytesWritten, curRes.cbProcessed));
                         fRc = False;
@@ -3218 +3218 @@
                             reporter.logXcpt('Seeking back to initial write position failed:');
                             fRc = False;
-                        if  fRc \
-                        and long(curFile.offset) != curTest.cbOffset:
-                            reporter.error('Test #%d failed: Initial write position does not match current position, \
-                                           got %d, expected %d' \
-                                           % (i, long(curFile.offset), curTest.cbOffset));
+                        if fRc and long(curFile.offset) != curTest.cbOffset:
+                            reporter.error('Test #%d failed: Initial write position does not match current position, '
+                                           'got %d, expected %d' % (i, long(curFile.offset), curTest.cbOffset));
                             fRc = False;
                     if fRc:
                         aBufRead = curFile.read(curTest.cbToReadWrite, 30 * 1000);
                         if len(aBufRead) != curTest.cbToReadWrite:
-                            reporter.error('Test #%d failed: Got buffer length %d, expected %d' \
+                            reporter.error('Test #%d failed: Got buffer length %d, expected %d'
                                            % (i, len(aBufRead), curTest.cbToReadWrite));
                             fRc = False;
-                        if  fRc \
-                        and curRes.aBuf is not None \
-                        and buffer(curRes.aBuf) != aBufRead:
-                            reporter.error('Test #%d failed: Got buffer\n%s, expected\n%s' \
+                        if    fRc \
+                          and curRes.aBuf is not None \
+                          and curRes.aBuf != aBufRead:
+                            reporter.error('Test #%d failed: Got buffer\n%s, expected\n%s'
                                            % (i, aBufRead, curRes.aBuf));
                             fRc = False;
@@ -3240 +3238 @@
                 resOffset = long(curRes.cbOffset);
                 if curOffset != resOffset:
-                    reporter.error('Test #%d failed: Final offset does not match: Got %d, expected %d' \
+                    reporter.error('Test #%d failed: Final offset does not match: Got %d, expected %d'
                                    % (i, curOffset, resOffset));
                     fRc = False;

trunk/src/VBox/ValidationKit/tests/api/tdPython1.py

@@ -36 +36 @@
 import time
 import threading
-import types
 
 # Only the main script needs to modify the path.
@@ -107 +106 @@
                     reporter.errorXcpt();
                     break;
-                if not isinstance(rc, types.IntType):
+                if not isinstance(rc, int):
                     reporter.error('waitForEvents returns non-integer type');
                     break;
@@ -204 +203 @@
 
                     # Check the return code and elapsed time.
-                    if not isinstance(rc, types.IntType):
+                    if not isinstance(rc, int):
                         reporter.error('waitForEvents returns non-integer type after %u ms, expected 1' % (msElapsed,));
                     elif rc != 1:

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

@@ -34 +34 @@
 import os;
 import shutil;
-import StringIO
+import sys;
+if sys.version_info[0] >= 3:
+    from io import StringIO as StringIO;            # pylint: disable=import-error,no-name-in-module
+else:
+    from StringIO import StringIO as StringIO;      # pylint: disable=import-error,no-name-in-module
 import subprocess;
 
@@ -41 +45 @@
 from testdriver import reporter;
 
+
+
 class StdInOutBuffer(object):
     """ Standard input output buffer """
 
     def __init__(self, sInput = None):
-        self.sInput = StringIO.StringIO();
+        self.sInput = StringIO();
         if sInput is not None:
             self.sInput.write(self._toString(sInput));

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

@@ -315 +315 @@
         fRc = True;
         sBlkDev = None;
-        if self.dSimplePools.has_key(sPool):
+        if sPool in self.dSimplePools:
             sDiskPath = self.dSimplePools.get(sPool);
             if sDiskPath.find('zram') != -1:
@@ -357 +357 @@
         self.dMounts.pop(sPool + '/' + sVol);
         oExec.rmDir(sMountPoint);
-        if self.dSimplePools.has_key(sPool):
+        if sPool in self.dSimplePools:
             # Wipe partition table
             sDiskPath = self.dSimplePools.get(sPool);
@@ -372 +372 @@
         """
         fRc = True;
-        if self.dSimplePools.has_key(sPool):
+        if sPool in self.dSimplePools:
             self.dSimplePools.pop(sPool);
         else:
@@ -565 +565 @@
         fRc = True;
         sMountPoint = None;
-        if self.dPools.has_key(sPool):
+        if sPool in self.dPools:
             sVol = 'vol' + str(self.iVolId);
             sMountPoint = self.oStorOs.getMntBase() + '/' + sVol;

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

@@ -35 +35 @@
 import socket;
 import sys;
-import StringIO;
+if sys.version_info[0] >= 3:
+    from io       import StringIO as StringIO;      # pylint: disable=import-error,no-name-in-module
+else:
+    from StringIO import StringIO as StringIO;      # pylint: disable=import-error,no-name-in-module
 
 # Only the main script needs to modify the path.
@@ -97 +100 @@
             return False;
 
-        cfgBuf = StringIO.StringIO();
+        cfgBuf = StringIO();
         cfgBuf.write('[global]\n');
         cfgBuf.write('bs=' + self.dCfg.get('RecordSize', '4k') + '\n');
@@ -1143 +1146 @@
 
                         sIoLogFile = '%s/%s.iolog' % (self.sIoLogPath, sDrv);
-                        print sCfgmPath;
-                        print sIoLogFile;
+                        print(sCfgmPath);
+                        print(sIoLogFile);
                         oSession.o.machine.setExtraData('%s/IoLog' % (sCfgmPath,), sIoLogFile);
                     except:

trunk/src/VBox/ValidationKit/tests/usb/tst-utsgadget.py

@@ -31 +31 @@
 # Standard python imports.
 import sys
-import types
 
 # Validation Kit imports.
@@ -54 +53 @@
     global g_cTests, g_cFailures;
     g_cTests = g_cTests + 1;
-    if isinstance(rc, types.BooleanType):
+    if isinstance(rc, bool):
         if rc == fExpect:
             return 'PASSED';
@@ -88 +87 @@
             i = i + 2;
         elif asArgs[i] == '--help':
-            print 'tst-utsgadget.py [--hostname <addr|name>] [--port <num>] [--timeout <cMS>]'
+            print('tst-utsgadget.py [--hostname <addr|name>] [--port <num>] [--timeout <cMS>]');
             return 0;
         else:
-            print 'Unknown argument: %s' % (asArgs[i]);
+            print('Unknown argument: %s' % (asArgs[i],));
             return 2;
 
@@ -100 +99 @@
         rc = oGadget.connectTo(cMsTimeout, sAddress, uPort = uPort);
     if rc is False:
-        print 'connectTo failed';
+        print('connectTo failed');
         return 1;
 
     if fStdTests:
         rc = oGadget.getUsbIpPort() is not None;
-        print '%s: getUsbIpPort() -> %s' % (boolRes(rc), oGadget.getUsbIpPort());
+        print('%s: getUsbIpPort() -> %s' % (boolRes(rc), oGadget.getUsbIpPort(),));
 
         rc = oGadget.impersonate(usbgadget.g_ksGadgetImpersonationTest);
-        print '%s: impersonate()' % (boolRes(rc));
+        print('%s: impersonate()' % (boolRes(rc),));
 
         rc = oGadget.disconnectUsb();
-        print '%s: disconnectUsb()' % (boolRes(rc));
+        print('%s: disconnectUsb()' % (boolRes(rc),));
 
         rc = oGadget.connectUsb();
-        print '%s: connectUsb()' % (boolRes(rc));
+        print('%s: connectUsb()' % (boolRes(rc),));
 
         rc = oGadget.clearImpersonation();
-        print '%s: clearImpersonation()' % (boolRes(rc));
+        print('%s: clearImpersonation()' % (boolRes(rc),));
 
         # Test super speed (and therefore passing configuration items)
         rc = oGadget.impersonate(usbgadget.g_ksGadgetImpersonationTest, True);
-        print '%s: impersonate(, True)' % (boolRes(rc));
+        print('%s: impersonate(, True)' % (boolRes(rc),));
 
         rc = oGadget.clearImpersonation();
-        print '%s: clearImpersonation()' % (boolRes(rc));
+        print('%s: clearImpersonation()' % (boolRes(rc),));
 
         # Done
         rc = oGadget.disconnectFrom();
-        print '%s: disconnectFrom() -> %s' % (boolRes(rc), rc);
+        print('%s: disconnectFrom() -> %s' % (boolRes(rc), rc,));
 
     if g_cFailures != 0:
-        print 'tst-utsgadget.py: %u out of %u test failed' % (g_cFailures, g_cTests);
+        print('tst-utsgadget.py: %u out of %u test failed' % (g_cFailures, g_cTests,));
         return 1;
-    print 'tst-utsgadget.py: all %u tests passed!' % (g_cTests);
+    print('tst-utsgadget.py: all %u tests passed!' % (g_cTests,));
     return 0;
 

trunk/src/VBox/ValidationKit/tests/usb/usbgadget.py

@@ -34 +34 @@
 import select
 import socket
+import sys;
 import threading
 import time
-import types
 import zlib
 
@@ -44 +44 @@
 from testdriver import reporter;
 from testdriver.base    import TdTaskBase;
+
+# Python 3 hacks:
+if sys.version_info[0] >= 3:
+    long = int;     # pylint: disable=redefined-builtin,invalid-name
+
 
 ## @name USB gadget impersonation string constants.
@@ -196 +201 @@
     abArray = array.array('B');
     sUtf8 = sStr.encode('utf_8');
-    for i in range(0, len(sUtf8)):
-        abArray.append(ord(sUtf8[i]))
+    for ch in sUtf8:
+        abArray.append(ord(ch));
     abArray.append(0);
     return abArray;
@@ -447 +452 @@
                     # the primitive approach...
                     sUtf8 = o.encode('utf_8');
-                    for i in range(0, len(sUtf8)):
-                        abPayload.append(ord(sUtf8[i]))
+                    for ch in sUtf8:
+                        abPayload.append(ord(ch))
                     abPayload.append(0);
-                elif isinstance(o, types.LongType):
+                elif isinstance(o, long):
                     if o < 0 or o > 0xffffffff:
                         reporter.fatal('sendMsg: uint32_t payload is out of range: %s' % (hex(o)));
                         return None;
                     abPayload.extend(u32ToByteArray(o));
-                elif isinstance(o, types.IntType):
+                elif isinstance(o, int):
                     if o < 0 or o > 0xffffffff:
                         reporter.fatal('sendMsg: uint32_t payload is out of range: %s' % (hex(o)));
@@ -1063 +1068 @@
             oSocket.connect((self.sHostname, self.uPort));
             rc = True;
-        except socket.error as e:
-            iRc = e[0];
-            if self.__isInProgressXcpt(e):
+        except socket.error as oXcpt:
+            iRc = oXcpt.errno;
+            if self.__isInProgressXcpt(oXcpt):
                 # Do the actual waiting.
-                reporter.log2('TransportTcp::connect: operation in progress (%s)...' % (e,));
+                reporter.log2('TransportTcp::connect: operation in progress (%s)...' % (oXcpt,));
                 try:
                     ttRc = select.select([oWakeupR], [oSocket], [oSocket, oWakeupR], cMsTimeout / 1000.0);
@@ -1074 +1079 @@
                     iRc = oSocket.getsockopt(socket.SOL_SOCKET, socket.SO_ERROR);
                     rc = iRc == 0;
-                except socket.error as e:
-                    iRc = e[0];
+                except socket.error as oXcpt2:
+                    iRc = oXcpt2.errno;
                 except:
                     iRc = -42;