Changeset 74003 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

Aug 31, 2018 2:47:37 PM (6 years ago)

Author:

vboxsync

Message:

Main: bugref:9231: added ability to set IMedium:location for medium moved by user

Location:

trunk/src/VBox/ValidationKit

Files:

• testdriver/vbox.py (modified) (2 diffs)
• tests/api/tdMoveMedium1.py (modified) (6 diffs)
• tests/api/tdMoveVM1.py (modified) (1 diff)

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

@@ -783 +783 @@
         self.fImportedVBoxApi   = False;
         self.fpApiVer           = 3.2;
+        self.uRevision          = 0;
         self.oBuild             = None;
         self.oVBoxMgr           = None;
@@ -1318 +1319 @@
                 else:
                     self.fpApiVer += 1.1;
+
+            try:
+                self.uRevision = oVBox.revision;
+            except:
+                reporter.logXcpt('Failed to get VirtualBox revision, assuming 0');
+                self.uRevision = 0;
+            reporter.log("IVirtualBox.revision=%u" % (self.uRevision,));
 
             # Patch VBox manage to gloss over portability issues (error constants, etc).

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

@@ -66 +66 @@
     #
 
-    def setLocation(self, sLocation, aoMediumAttachments):
+    def moveTo(self, sLocation, aoMediumAttachments):
         for oAttachment in aoMediumAttachments:
             try:
@@ -74 +74 @@
                 reporter.errorXcpt('failed to get the medium from the IMediumAttachment "%s"' % (oAttachment))
 
-            try:
-                oProgress = vboxwrappers.ProgressWrapper(oMedium.setLocation(sLocation), self.oTstDrv.oVBoxMgr, self.oTstDrv,
-                                                         'move "%s"' % (oMedium.name,))
-            except:
-                return reporter.errorXcpt('Medium::setLocation("%s") for medium "%s" failed' % (sLocation, oMedium.name,))
+            if self.oTstDrv.fpApiVer >= 5.3 and self.oTstDrv.uRevision > 124748:
+                try:
+                    oProgress = vboxwrappers.ProgressWrapper(oMedium.moveTo(sLocation), self.oTstDrv.oVBoxMgr, self.oTstDrv,
+                                                             'move "%s"' % (oMedium.name,));
+                except:
+                    return reporter.errorXcpt('Medium::moveTo("%s") for medium "%s" failed' % (sLocation, oMedium.name,));
+            else:
+                try:
+                    oProgress = vboxwrappers.ProgressWrapper(oMedium.setLocation(sLocation), self.oTstDrv.oVBoxMgr, self.oTstDrv,
+                                                             'move "%s"' % (oMedium.name,));
+                except:
+                    return reporter.errorXcpt('Medium::setLocation("%s") for medium "%s" failed' % (sLocation, oMedium.name,));
+
 
             oProgress.wait()
@@ -149 +157 @@
             aoMediumAttachments = oVM.getMediumAttachmentsOfController(sController)
             #case 1. Only path without file name, with trailing separator
-            fRc = self.setLocation(sNewLoc + os.sep, aoMediumAttachments) and fRc
+            fRc = self.moveTo(sNewLoc + os.sep, aoMediumAttachments) and fRc
             fRc = self.checkLocation(sNewLoc, aoMediumAttachments, asFiles) and fRc
 
             #case 2. Only path without file name, without trailing separator
-            fRc = self.setLocation(sOrigLoc, aoMediumAttachments) and fRc
+            fRc = self.moveTo(sOrigLoc, aoMediumAttachments) and fRc
             fRc = self.checkLocation(sOrigLoc, aoMediumAttachments, asFiles) and fRc
 
@@ -162 +170 @@
             #and the file name is processed as folder name (aka mv(1) logic).
             #Be discussed.
-            fRc = self.setLocation(os.path.join(sNewLoc, 'newName'), aoMediumAttachments) and fRc
+            fRc = self.moveTo(os.path.join(sNewLoc, 'newName'), aoMediumAttachments) and fRc
             asNewFiles = ['newName' + os.path.splitext(s)[1] for s in asFiles]
             fRc = self.checkLocation(os.path.join(sNewLoc, 'newName'), aoMediumAttachments, asFiles) and fRc
@@ -170 +178 @@
 
             #case 4. Only file name
-            fRc = self.setLocation('onlyMediumName', aoMediumAttachments) and fRc
+            fRc = self.moveTo('onlyMediumName', aoMediumAttachments) and fRc
             asNewFiles = ['onlyMediumName' + os.path.splitext(s)[1] for s in asFiles]
             if self.oTstDrv.fpApiVer >= 5.3:
@@ -183 +191 @@
                 aoMediumAttachments = oVM.getMediumAttachmentsOfController(sController)
                 asSnapFiles = [os.path.basename(o.medium.name) for o in aoMediumAttachments]
-                fRc = self.setLocation(sOrigLoc, aoMediumAttachments) and fRc
+                fRc = self.moveTo(sOrigLoc, aoMediumAttachments) and fRc
                 fRc = self.checkLocation(sOrigLoc, aoMediumAttachments, asSnapFiles) and fRc
 

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

@@ -287 +287 @@
         aoMediumAttachments = oMachine.getMediumAttachmentsOfController(sController)
         oSubTstDrvMoveMedium1Instance = SubTstDrvMoveMedium1(self.oTstDrv)
-        oSubTstDrvMoveMedium1Instance.setLocation(sOldLoc, aoMediumAttachments)
+        oSubTstDrvMoveMedium1Instance.moveTo(sOldLoc, aoMediumAttachments)
 
         del oSubTstDrvMoveMedium1Instance