Changeset 71411 in vbox

Timestamp:

Mar 20, 2018 4:26:52 PM (7 years ago)

Author:

vboxsync

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

121378

Message:

ValidationKit: bugref:8345 fix incorrect use of direct API call, replacing by helper for future use

Location:

trunk/src/VBox/ValidationKit

Files:

• testdriver/vboxwrappers.py (modified) (3 diffs)
• tests/api/tdMoveVM1.py (modified) (1 diff)

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

@@ -2519 +2519 @@
             self.o.console.pause();
         if self.oVM.state is not vboxcon.MachineState_Paused:
-            vbox.reportError(oProgress, 'pause for "%s" failed' % (self.sName));
+            reporter.error('pause for "%s" failed' % (self.sName));
         # Try saving state.
         try:
@@ -2525 +2525 @@
                 oProgress = self.o.machine.saveState()
             else:
-                oProgress = self.o.console.saveState();
+                oProgress = self.o.console.saveState()
         except:
             reporter.logXcpt('IMachine::saveState failed on %s' % (self.sName));
@@ -2539 +2539 @@
         self.oTstDrv.waitOnDirectSessionClose(self.oVM, 5000);         # fudge
         return self.waitForTask(30 * 1000);                            # fudge
+
+    def discardSavedState(self, fRemove = True):
+        """
+        Discards saved state of the VM.
+
+        Returns True on success.
+        Returns False on IConsole::discardSaveState() failure.
+        """
+
+        try:
+            if self.fpApiVer >= 5.0:
+                self.o.machine.discardSavedState(fRemove)
+            else:
+                self.o.console.discardSavedState(fRemove)
+        except:
+            reporter.logXcpt('IMachine::discardSavedState failed on %s' % (self.sName))
+            return False
+        return True
 
     def restoreSnapshot(self, oSnapshot, fFudgeOnFailure = True):

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

@@ -313 +313 @@
 
                 # cleaning up: get rid of saved state
-                fRc = fRc and oSession.o.machine.discardSavedState(True)
+                fRc = fRc and oSession.discardSavedState(True)
                 if fRc is False:
                     reporter.log('Failed to discard the saved state of machine')