Changeset 70509 in vbox for trunk/src/VBox

Timestamp:

Jan 10, 2018 11:23:52 AM (7 years ago)

Author:

vboxsync

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

120133

Message:

ValidationKit/tests: python 3 updates.

Location:

trunk/src/VBox/ValidationKit

Files:

• Config.kmk (modified) (1 diff)
• tests/additions/tdAddGuestCtrl.py (modified) (6 diffs)
• tests/teleportation/tdTeleportLocal1.py (modified) (3 diffs)
• tests/usb/usbgadget.py (modified) (6 diffs)
• utils/TestExecServ/Makefile.kmk (modified) (2 diffs)

trunk/src/VBox/ValidationKit/Config.kmk

@@ -109 +109 @@
 
 TEMPLATE_VBoxValidationKitR3_USES += vboximportchecker
-TEMPLATE_VBoxValidationKitR3_VBOX_IMPORT_CHECKER.win.x86   = nt350
+TEMPLATE_VBoxValidationKitR3_VBOX_IMPORT_CHECKER   = nt31$(error fuck)
+TEMPLATE_VBoxValidationKitR3_VBOX_IMPORT_CHECKER.x86   = nt31$(error fuck)
+TEMPLATE_VBoxValidationKitR3_VBOX_IMPORT_CHECKER.win.x86   = nt31$(error fuck)
 TEMPLATE_VBoxValidationKitR3_VBOX_IMPORT_CHECKER.win.amd64 = xp64
 

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

@@ -539 +539 @@
             else:
                 oGstCtrlSession.environmentSet(self.sVar, self.sValue);
-        except vbox.ComException, oXcpt:
+        except vbox.ComException as oXcpt:
             # Is this an expected failure?
             if vbox.ComError.equal(oXcpt, self.hrcExpected):
@@ -580 +580 @@
             else:
                 oGstCtrlSession.environmentUnset(self.sVar);
-        except vbox.ComException, oXcpt:
+        except vbox.ComException as oXcpt:
             # Is this an expected failure?
             if vbox.ComError.equal(oXcpt, self.hrcExpected):
@@ -621 +621 @@
             else:
                 oTstDrv.oVBoxMgr.setArray(oGstCtrlSession, 'environment', self.asEnv);
-        except vbox.ComException, oXcpt:
+        except vbox.ComException as oXcpt:
             # Is this an expected failure?
             if vbox.ComError.equal(oXcpt, self.hrcExpected):
@@ -726 +726 @@
                 else:
                     oFsInfo = oGstCtrlSession.fileQueryInfo(self.sPath);
-            except vbox.ComException, oXcpt:
+            except vbox.ComException as oXcpt:
                 ## @todo: The error reporting in the API just plain sucks! Most of the errors are
                 ##        VBOX_E_IPRT_ERROR and there seems to be no way to distinguish between
@@ -1208 +1208 @@
                                        % (sSubDir, oFsObjInfo.name, oFsObjInfo.type));
                         fRc = False;
-                except Exception, oXcpt:
+                except Exception as oXcpt:
                     # No necessarily an error -- could be VBOX_E_OBJECT_NOT_FOUND. See reference.
                     if vbox.ComError.equal(oXcpt, vbox.ComError.VBOX_E_OBJECT_NOT_FOUND):
@@ -1359 +1359 @@
                                        (sCurDir, oFsObjInfo.name, oFsObjInfo.type));
                         fRc = False;
-                except Exception, oXcpt:
+                except Exception as oXcpt:
                     # No necessarily an error -- could be VBOX_E_OBJECT_NOT_FOUND. See reference.
                     if vbox.ComError.equal(oXcpt, vbox.ComError.VBOX_E_OBJECT_NOT_FOUND):

trunk/src/VBox/ValidationKit/tests/teleportation/tdTeleportLocal1.py

@@ -764 +764 @@
         try:
             oSession.o.machine.teleporterPort = uPort;
-        except Exception, oXcpt:
+        except Exception as oXcpt:
             if not fInvalid or vbox.ComError.notEqual(oXcpt, vbox.ComError.E_INVALIDARG):
                 return reporter.testFailureXcpt('machine.teleporterPort=%u' % (uPort,));
@@ -875 +875 @@
         try:
             oProgress = oSession.o.console.teleport(sHostname, uPort, sPassword, cMsMaxDowntime);
-        except vbox.ComException, oXcpt:
+        except vbox.ComException as oXcpt:
             if vbox.ComError.equal(oXcpt, hrcExpected):
                 fRc = True;
@@ -882 +882 @@
                                      % (vbox.ComError.toString(oXcpt.hresult),
                                         vbox.ComError.toString(hrcExpected)));
-        except Exception, oXcpt:
+        except Exception as oXcpt:
             reporter.testFailure('Unexpected exception %s' % (oXcpt));
         else:

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

@@ -1063 +1063 @@
             oSocket.connect((self.sHostname, self.uPort));
             rc = True;
-        except socket.error, e:
+        except socket.error as e:
             iRc = e[0];
             if self.__isInProgressXcpt(e):
@@ -1074 +1074 @@
                     iRc = oSocket.getsockopt(socket.SOL_SOCKET, socket.SO_ERROR);
                     rc = iRc == 0;
-                except socket.error, e:
+                except socket.error as e:
                     iRc = e[0];
                 except:
@@ -1191 +1191 @@
             if cbSent == len(abBuf):
                 return True;
-        except Exception, oXcpt:
+        except Exception as oXcpt:
             if not self.__isWouldBlockXcpt(oXcpt):
                 reporter.errorXcpt('TranportTcp.sendBytes: %s bytes' % (len(abBuf)));
@@ -1223 +1223 @@
                 if cbSent == len(abBuf):
                     return True;
-            except Exception, oXcpt:
+            except Exception as oXcpt:
                 if not self.__isWouldBlockXcpt(oXcpt):
                     reporter.errorXcpt('TranportTcp.sendBytes: %s bytes' % (len(abBuf)));
@@ -1248 +1248 @@
                 if abBuf:
                     self.abReadAhead.extend(array.array('B', abBuf));
-            except Exception, oXcpt:
+            except Exception as oXcpt:
                 if not self.__isWouldBlockXcpt(oXcpt):
                     reporter.errorXcpt('TranportTcp.recvBytes: 0/%s bytes' % (cb,));
@@ -1291 +1291 @@
                 self.abReadAhead.extend(array.array('B', abBuf));
 
-            except Exception, oXcpt:
+            except Exception as oXcpt:
                 reporter.log('recv => exception %s' % (oXcpt,));
                 if not self.__isWouldBlockXcpt(oXcpt):

trunk/src/VBox/ValidationKit/utils/TestExecServ/Makefile.kmk

@@ -37 +37 @@
         TestExecService.cpp \
         TestExecServiceTcp.cpp
+TestExecService_VBOX_IMPORT_CHECKER.win.x86   = nt31 $(warning fix VBOX_IMPORT_CHECKER.win.x86 template bugbug!)
 
 INSTALLS += TestExecServiceFiles
@@ -65 +66 @@
 include $(FILE_KBUILD_SUB_FOOTER)
 
+#%fffffe800000600c 0f 20 dc                mov esp, cr3
+#%fffffe800000600f 0f 1f 44 00 00          db 00fh, 01fh,044h,090h,090h
+#%fffffe8000006014 48 81 e4 ff e7 ff ff    and rsp, 0ffffffffffffe7ffh
+#%fffffe800000601b 0f 22 dc                mov cr3, esp
+