Changeset 70849 in vbox for trunk/src/VBox/ValidationKit/tests/api/tdMoveMedium1.py

Timestamp:

Feb 1, 2018 1:27:34 PM (7 years ago)

Author:

vboxsync

Message:

ValidationKit: improve API testcase for moving media (now tests all hard disk format backends, not just VDI), make pylint happy

File:

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

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

@@ -44 +44 @@
 from testdriver import base
 from testdriver import reporter
+from testdriver import vboxcon
 from testdriver import vboxwrappers
 
@@ -51 +52 @@
     Sub-test driver for Medium Move Test #1.
     """
-
-    # List of suffixes to append.
-    suffixes = [
-        '.vdi',
-    ]
 
     def __init__(self, oTstDrv):
@@ -79 +75 @@
 
             try:
-                oProgress = vboxwrappers.ProgressWrapper(oMedium.setLocation(sLocation), self.oTstDrv.oVBoxMgr, self.oTstDrv, 'move "%s"' % (oMedium.name,))
+                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,))
@@ -105 +102 @@
             assert oVM is not None
 
-            # create virtual disk image vdi
+            # create disk images
             fRc = True
             c = 0
             oSession = self.oTstDrv.openSession(oVM)
-            for i in self.suffixes:
-                sHddPath = os.path.join(self.oTstDrv.sScratchPath, 'Test' + str(c) + i)
-                oHd = oSession.createBaseHd(sHddPath, cb=1024*1024)
+            aoDskFmts = self.oTstDrv.oVBoxMgr.getArray(self.oTstDrv.oVBox.systemProperties, 'mediumFormats')
+            for oDskFmt in aoDskFmts:
+                aoDskFmtCaps = self.oTstDrv.oVBoxMgr.getArray(oDskFmt, 'capabilities')
+                if vboxcon.MediumFormatCapabilities_File not in aoDskFmtCaps \
+                    or vboxcon.MediumFormatCapabilities_CreateDynamic not in aoDskFmtCaps:
+                    continue
+                (asExts, aTypes) = oDskFmt.describeFileExtensions()
+                for i in range(0, len(asExts)):
+                    if aTypes[i] is vboxcon.DeviceType_HardDisk:
+                        sExt = '.' + asExts[i]
+                        break
+                if sExt is None:
+                    fRc = False
+                    break
+                sHddPath = os.path.join(self.oTstDrv.sScratchPath, 'Test' + str(c) + sExt)
+                oHd = oSession.createBaseHd(sHddPath, sFmt=oDskFmt.id, cb=1024*1024)
                 if oHd is None:
                     fRc = False
@@ -118 +128 @@
                 # attach HDD, IDE controller exists by default, but we use SATA just in case
                 sController='SATA Controller'
-                fRc = fRc and oSession.attachHd(sHddPath, sController, iPort = c, iDevice = 0, fImmutable=False, fForceResource=False)
-                fRc = fRc and oSession.saveSettings()
+                fRc = fRc and oSession.attachHd(sHddPath, sController, iPort = c, fImmutable=False, fForceResource=False)
+                if fRc:
+                    c += 1
+
+            fRc = fRc and oSession.saveSettings()
 
             #create temporary subdirectory in the current working directory
@@ -125 +138 @@
             sNewLoc = os.path.join(sOrigLoc, 'newLocation/')
 
-            os.makedirs(sNewLoc, 0o775)
+            os.mkdir(sNewLoc, 0o775)
 
             aListOfAttach = oVM.getMediumAttachmentsOfController(sController)
@@ -137 +150 @@
 
             #case 3. Path with file name
-            sLocation = sNewLoc + 'newName.vdi'
+            sLocation = sNewLoc + 'newName'
             self.setLocation(sLocation, aListOfAttach)