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

Timestamp:

Apr 6, 2018 10:07:33 PM (7 years ago)

Author:

vboxsync

Message:

bugref:8345. Several small improvements.

File:

• trunk/src/VBox/ValidationKit/tests/api/tdMoveVM1.py (modified) (7 diffs)

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

@@ -218 +218 @@
                     reporter.log('Item location "%s" isn\'t correct' % (eachItem))
 
+                reporter.log('####### Reference locations: #######')
+                for eachItem in aReferences:
+                    reporter.log(' "%s"' % (eachItem))
+
                 if len (intersection) != len (aActuals):
                     reporter.log('Not all items in the right location. Check it.')
@@ -270 +274 @@
         if self.oTstDrv.asRsrcs is None:
             self.oTstDrv.asRsrcs = []
-            self.oTstDrv.asRsrcs.append('5.3/isos/tdMoveVM.iso')
-            self.oTstDrv.asRsrcs.append('5.3/floppy/tdMoveVM.img')
+            self.oTstDrv.asRsrcs.append('5.3' + os.sep + 'isos' + os.sep + 'tdMoveVM1.iso')
+            self.oTstDrv.asRsrcs.append('5.3' + os.sep + 'floppy' + os.sep + 'tdMoveVM1.img')
 
         return self.oTstDrv.asRsrcs
@@ -369 +373 @@
         #call Session::saveState(), already closes session unless it failed
         fRc = oSession.saveState()
-        self.oTstDrv.terminateVmBySession(oSession)
-
-        if fRc:
+        if fRc is True:
+            reporter.log("Machine is in saved state")
+
+        fRc = self.oTstDrv.terminateVmBySession(oSession)
+
+        if fRc is True or False:
             #create a new Session object for moving VM
             oSession = self.oTstDrv.openSession(oMachine)
@@ -423 +430 @@
         oSession = self.oTstDrv.openSession(oMachine)
 
-        sISOLoc = '5.3/isos/tdMoveVM1.iso'
+        sISOLoc = self.asRsrcs[0]#'5.3/isos/tdMoveVM1.iso'
         reporter.log("sHost is '%s', sResourcePath is '%s'" % (self.oTstDrv.sHost, self.oTstDrv.sResourcePath))
         sISOLoc = self.oTstDrv.getFullResourceName(sISOLoc)
+        reporter.log("sISOLoc is '%s'" % (sISOLoc,))
 
         if not os.path.exists(sISOLoc):
@@ -438 +446 @@
             #set actual ISO location
             sISOLoc = sOldLoc + os.sep + sISOImageName
+            reporter.log("sISOLoc is '%s'" % (sISOLoc,))
+            if not os.path.exists(sISOLoc):
+                reporter.log('ISO file does not exist at "%s"' % (sISOLoc,))
+                fRc = False
+
             sController=self.dsKeys['ISOImage']
             aoMediumAttachments = oMachine.getMediumAttachmentsOfController(sController)
@@ -483 +496 @@
         oSession = self.oTstDrv.openSession(oMachine)
 
-        sFloppyLoc = '5.3/floppy/tdMoveVM1.img'
+        sFloppyLoc = self.asRsrcs[1]#'5.3/floppy/tdMoveVM1.img'
         sFloppyLoc = self.oTstDrv.getFullResourceName(sFloppyLoc)
 
@@ -507 +520 @@
                 fRc = self.checkLocation(oSession.o.machine, dsReferenceFiles)
                 if fRc is False:
-                    reporter.testFailure('!!!!!!!!!!!!!!!!!! 5th scenario: Check locations failed... !!!!!!!!!!!!!!!!!!')
+                    reporter.testFailure('!!!!!!!!!!!!!!!!!! 6th scenario: Check locations failed... !!!!!!!!!!!!!!!!!!')
             else:
-                reporter.testFailure('!!!!!!!!!!!!!!!!!! 5th scenario: Move VM failed... !!!!!!!!!!!!!!!!!!')
+                reporter.testFailure('!!!!!!!!!!!!!!!!!! 6th scenario: Move VM failed... !!!!!!!!!!!!!!!!!!')
         else:
-            reporter.testFailure('!!!!!!!!!!!!!!!!!! 5th scenario: Attach floppy image failed... !!!!!!!!!!!!!!!!!!')
+            reporter.testFailure('!!!!!!!!!!!!!!!!!! 6th scenario: Attach floppy image failed... !!!!!!!!!!!!!!!!!!')
 
         #detach floppy image