Changeset 55084 in vbox for trunk

Timestamp:

Apr 1, 2015 10:53:51 PM (10 years ago)

Author:

vboxsync

Message:

ValidationKit: Replace checks for API version 4.4 with 5.0, 4.4 does not exist anymore. Not strictly necessary as the checks would trigger correctly but it removes a possible source of confusion

Location:

trunk/src/VBox/ValidationKit

Files:

• testdriver/vboxtestvms.py (modified) (3 diffs)
• testdriver/vboxwrappers.py (modified) (3 diffs)
• tests/storage/tdStorageBenchmark1.py (modified) (1 diff)
• tests/storage/tdStorageStress1.py (modified) (1 diff)

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

@@ -317 +317 @@
                         fRc = fRc and oSession.setCpuCount(cCpus);
 
-                        if sParavirtMode is not None and oSession.fpApiVer >= 4.4:
+                        if sParavirtMode is not None and oSession.fpApiVer >= 5.0:
                             adParavirtProviders = {
                                 g_ksParavirtProviderNone   : vboxcon.ParavirtProvider_None,
@@ -708 +708 @@
 
             # Ditto for paravirtualization modes, except if not specified we got a less obvious default.
-            if self.asParavirtModes is not None  and  oTestDrv.fpApiVer >= 4.4:
+            if self.asParavirtModes is not None  and  oTestDrv.fpApiVer >= 5.0:
                 asParavirtModes = [sPvMode for sPvMode in oTestVm.asParavirtModesSup if sPvMode in self.asParavirtModes];
                 assert None not in asParavirtModes;
-            elif oTestDrv.fpApiVer >= 4.4:
+            elif oTestDrv.fpApiVer >= 5.0:
                 asParavirtModes = (oTestVm.asParavirtModesSup[0],);
                 assert asParavirtModes[0] is not None;
@@ -735 +735 @@
                     for sParavirtMode in asParavirtModes:
                         if sParavirtMode is not None:
-                            assert oTestDrv.fpApiVer >= 4.4;
+                            assert oTestDrv.fpApiVer >= 5.0;
                             reporter.testStart('%s' % ( sParavirtMode, ) );
 

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

@@ -1712 +1712 @@
         """
         try:
-            if self.fpApiVer >= 4.4:
+            if self.fpApiVer >= 5.0:
                 oHd = self.oVBox.createMedium(sFmt, sHd, vboxcon.AccessMode_ReadWrite, vboxcon.DeviceType_HardDisk);
             else:
@@ -1732 +1732 @@
         """
         try:
-            if self.fpApiVer >= 4.4:
+            if self.fpApiVer >= 5.0:
                 oHd = self.oVBox.createMedium(sFmt, sHd, vboxcon.AccessMode_ReadWrite, vboxcon.DeviceType_HardDisk);
             else:
@@ -2278 +2278 @@
         """
         try:
-            if self.fpApiVer >= 4.4:
+            if self.fpApiVer >= 5.0:
                 iWidth, iHeight, _, _, _, _ = self.o.console.display.getScreenResolution(iScreenId)
                 aPngData = self.o.console.display.takeScreenShotToArray(iScreenId, iWidth, iHeight,

trunk/src/VBox/ValidationKit/tests/storage/tdStorageBenchmark1.py

@@ -481 +481 @@
                 listNames.append('LUN');
 
-                if self.fpApiVer >= 4.4:
+                if self.fpApiVer >= 5.0:
                     oHd = oSession.oVBox.createMedium(sDiskFormat, sDiskPath, vboxcon.AccessMode_ReadWrite, \
                                                       vboxcon.DeviceType_HardDisk);

trunk/src/VBox/ValidationKit/tests/storage/tdStorageStress1.py

@@ -354 +354 @@
                 listNames.append('LUN');
 
-                if self.fpApiVer >= 4.4:
+                if self.fpApiVer >= 5.0:
                     oHd = oSession.oVBox.createMedium(sDiskFormat, sDiskPath1, vboxcon.AccessMode_ReadWrite, \
                                                       vboxcon.DeviceType_HardDisk);