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

Timestamp:

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

Author:

vboxsync

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

120396

Message:

ValidationKit: Python 3 and pylint 1.8.1 adjustments/fixes.

Location:

trunk/src/VBox/ValidationKit/testdriver

Files:

• reporter.py (modified) (1 diff)
• txsclient.py (modified) (3 diffs)
• vbox.py (modified) (2 diffs)
• vboxtestvms.py (modified) (2 diffs)
• vboxwrappers.py (modified) (1 diff)
• winbase.py (modified) (10 diffs)

trunk/src/VBox/ValidationKit/testdriver/reporter.py

@@ -386 +386 @@
         #
         try:
-            import user;
-            self.sDefLogDir = os.path.abspath(os.path.join(user.home, "VBoxTestLogs"));
+            self.sDefLogDir = os.path.abspath(os.path.expanduser(os.path.join('~', 'VBoxTestLogs')));
         except:
             self.sDefLogDir = os.path.abspath("VBoxTestLogs");

trunk/src/VBox/ValidationKit/testdriver/txsclient.py

@@ -362 +362 @@
                         # 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, long):
@@ -1841 +1841 @@
             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);
@@ -1852 +1852 @@
                     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;

trunk/src/VBox/ValidationKit/testdriver/vbox.py

@@ -1450 +1450 @@
 
             # If not being used, we can safely uninitialize COM.
-            if cIfs == 0 and cObjs == 0 and cVBoxMgrs == 0 and len(aoObjsLeftBehind) == 0:
+            if cIfs == 0 and cObjs == 0 and cVBoxMgrs == 0 and not aoObjsLeftBehind:
                 reporter.log('_teardownVBoxApi:   Calling CoUninitialize...');
                 try:    pythoncom.CoUninitialize();             # pylint: disable=no-member
@@ -1501 +1501 @@
                     else:
                         fPrinted = False;
-                        if isinstance(oReferrer, dict) or isinstance(oReferrer, list) or isinstance(oReferrer, tuple):
+                        if isinstance(oReferrer, (dict, list, tuple)):
                             try:
                                 aoSubReferreres = gc.get_referrers(oReferrer);

trunk/src/VBox/ValidationKit/testdriver/vboxtestvms.py

@@ -542 +542 @@
         if asVirtModesSup is None:
             asVirtModesSup = list(g_asVirtModes);
-        TestVm.__init__(self, oSet, sVmName,
+        TestVm.__init__(self, sVmName,
+                        oSet = oSet,
                         acCpusSup = [1,],
                         sFloppy = sFloppy,
@@ -1019 +1020 @@
             if oVm.fGrouping & fGrouping:
                 if sTxsTransport is None  or  oVm.sNic0AttachType is None  or  sTxsTransport == oVm.sNic0AttachType:
-                    if not fCheckResources  or  len(oVm.getMissingResources(self.sResourcePath)) == 0:
+                    if not fCheckResources  or  not oVm.getMissingResources(self.sResourcePath):
                         oCopyVm = copy.deepcopy(oVm);
                         oCopyVm.oSet = oSet;

trunk/src/VBox/ValidationKit/testdriver/vboxwrappers.py

@@ -498 +498 @@
             reporter.doPollWork('ProgressWrapper.waitForOperation');
         # Not reached.
+        return -3; # Make pylin happy (for now).
 
     def doQuickApiTest(self):

trunk/src/VBox/ValidationKit/testdriver/winbase.py

@@ -37 +37 @@
 
 # Windows specific imports.
+import pywintypes;          # pylint: disable=import-error
+import winerror;            # pylint: disable=import-error
+import win32con;            # pylint: disable=import-error
 import win32api;            # pylint: disable=import-error
-import win32con;            # pylint: disable=import-error
 import win32console;        # pylint: disable=import-error
 import win32event;          # pylint: disable=import-error
 import win32process;        # pylint: disable=import-error
-import winerror;            # pylint: disable=import-error
-import pywintypes;          # pylint: disable=import-error
 
 # Validation Kit imports.
@@ -65 +65 @@
     try:
         # pylint: disable=no-member
-        win32console.GenerateConsoleCtrlEvent(win32con.CTRL_BREAK_EVENT, uPid);
+        win32console.GenerateConsoleCtrlEvent(win32con.CTRL_BREAK_EVENT, uPid);         # pylint: disable=c-extension-no-member
         #GenerateConsoleCtrlEvent = ctypes.windll.kernel32.GenerateConsoleCtrlEvent
         #rc = GenerateConsoleCtrlEvent(1, uPid);
@@ -79 +79 @@
     fRc = False;
     try:
-        win32api.PostThreadMessage(uTid, win32con.WM_CLOSE, 0, 0);                                  # pylint: disable=no-member
+        win32api.PostThreadMessage(uTid, win32con.WM_CLOSE, 0, 0);              # pylint: disable=no-member,c-extension-no-member
         fRc = True;
     except:
@@ -89 +89 @@
     fRc = False;
     try:
-        win32api.PostThreadMessage(uTid, win32con.WM_QUIT, 0x40010004, 0); # DBG_TERMINATE_PROCESS  # pylint: disable=no-member
+        win32api.PostThreadMessage(uTid, win32con.WM_QUIT,                      # pylint: disable=no-member,c-extension-no-member
+                                   0x40010004, 0); # DBG_TERMINATE_PROCESS
         fRc = True;
     except:
@@ -100 +101 @@
     fRc = False;
     try:
-        hProcess = win32api.OpenProcess(win32con.PROCESS_TERMINATE, False, uPid);
+        hProcess = win32api.OpenProcess(win32con.PROCESS_TERMINATE,             # pylint: disable=no-member,c-extension-no-member
+                                        False, uPid);
     except:
         reporter.logXcpt('uPid=%s' % (uPid,));
     else:
         try:
-            win32process.TerminateProcess(hProcess, 0x40010004); # DBG_TERMINATE_PROCESS
+            win32process.TerminateProcess(hProcess,                             # pylint: disable=no-member,c-extension-no-member
+                                          0x40010004); # DBG_TERMINATE_PROCESS
             fRc = True;
         except:
@@ -120 +123 @@
     # We try open the process for waiting since this is generally only forbidden in a very few cases.
     try:
-        hProcess = win32api.OpenProcess(win32con.SYNCHRONIZE, False, uPid);     # pylint: disable=no-member
+        hProcess = win32api.OpenProcess(win32con.SYNCHRONIZE, False, uPid);     # pylint: disable=no-member,c-extension-no-member
     except pywintypes.error as oXcpt:                                           # pylint: disable=no-member
         if oXcpt.winerror == winerror.ERROR_INVALID_PARAMETER:
@@ -182 +185 @@
     # pylint: disable=no-member
     dwCreationFlags = win32con.CREATE_NEW_PROCESS_GROUP;
-    oStartupInfo    = win32process.STARTUPINFO();
-    try:
-        (hProcess, hThread, uPid, uTid) = win32process.CreateProcess(sName,
+    oStartupInfo    = win32process.STARTUPINFO();                                       # pylint: disable=c-extension-no-member
+    try:
+        (hProcess, hThread, uPid, uTid) = win32process.CreateProcess(sName,             # pylint: disable=c-extension-no-member
             sCmdLine,                   # CommandLine
             None,                       # ProcessAttributes
@@ -205 +208 @@
     # Try get full access to the process.
     try:
-        hProcessFullAccess = win32api.DuplicateHandle(
-            win32api.GetCurrentProcess(),
+        hProcessFullAccess = win32api.DuplicateHandle(                                  # pylint: disable=c-extension-no-member
+            win32api.GetCurrentProcess(),                                               # pylint: disable=c-extension-no-member
             hProcess,
-            win32api.GetCurrentProcess(),
+            win32api.GetCurrentProcess(),                                               # pylint: disable=c-extension-no-member
             win32con.PROCESS_TERMINATE
             | win32con.PROCESS_QUERY_INFORMATION
@@ -227 +230 @@
     """
     try:
-        dwWait = win32event.WaitForSingleObject(hProcess, 0);                                       # pylint: disable=no-member
+        dwWait = win32event.WaitForSingleObject(hProcess, 0);                   # pylint: disable=no-member,c-extension-no-member
     except:
         reporter.logXcpt('hProcess=%s %#x' % (hProcess, hProcess.handle,));
@@ -239 +242 @@
     """
     try:
-        win32api.TerminateProcess(hProcess, 0x40010004); # DBG_TERMINATE_PROCESS                    # pylint: disable=no-member
+        win32api.TerminateProcess(hProcess,                                     # pylint: disable=no-member,c-extension-no-member
+                                  0x40010004); # DBG_TERMINATE_PROCESS
     except:
         reporter.logXcpt('hProcess=%s %#x' % (hProcess, hProcess.handle,));