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

Timestamp:

Jun 29, 2016 1:04:00 PM (9 years ago)

Author:

vboxsync

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

108370

Message:

testdriver/vbox*.py: Stop testing on runtime errors.

Location:

trunk/src/VBox/ValidationKit/testdriver

Files:

• vbox.py (modified) (1 diff)
• vboxwrappers.py (modified) (1 diff)

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

@@ -754 +754 @@
     def onMachineStateChange(self, sMachineId, eState):                         # pylint: disable=W0613
         """ Just interrupt the wait loop here so it can check again. """
+        _ = sMachineId; _ = eState;
+        self.oVBoxMgr.interruptWaitEvents();
+
+    def onRuntimeError(self, fFatal, sErrId, sMessage):
+        reporter.log('onRuntimeError/%s: fFatal=%d sErrId=%s sMessage=%s' % (self.sName, fFatal, sErrId, sMessage));
+        oSession = self.oSession;
+        if oSession is not None: # paranoia
+            oSession.signalTask();
         self.oVBoxMgr.interruptWaitEvents();
 

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

@@ -638 +638 @@
         This method returns False while the VM is online and running normally.
         """
-        fRc = self.__pollTask();
+
+        # Call super to check if the task was signalled by runtime error or similar,
+        # if not then check the VM state via __pollTask.
+        fRc = super(SessionWrapper, self).pollTask(fLocked);
+        if not fRc:
+            fRc = self.__pollTask();
 
         # HACK ALERT: Lazily try registering the console event handler if