Changeset 59605 in vbox for trunk/src/VBox/ValidationKit/tests/installation/tdGuestOsInstTest1.py

Timestamp:

Feb 8, 2016 5:19:41 PM (9 years ago)

Author:

vboxsync

Message:

Randomly switch between SATA/SCSI controller.

File:

• trunk/src/VBox/ValidationKit/tests/installation/tdGuestOsInstTest1.py (modified) (3 diffs)

trunk/src/VBox/ValidationKit/tests/installation/tdGuestOsInstTest1.py

@@ -34 +34 @@
 import os
 import sys
+import random
 
 
@@ -54 +55 @@
 
     ## @name The primary controller, to which the disk will be attached.
+    ksScsiController = 'SCSI Controller'
     ksSataController = 'SATA Controller'
     ksIdeController  = 'IDE Controller'
@@ -137 +139 @@
             oSession = oTestDrv.openSession(oVM);
             if oSession is not None:
-                if self.sHddControllerType == self.ksSataController:
-                    fRc = fRc and oSession.setStorageControllerType(vboxcon.StorageControllerType_IntelAhci,
-                                                                    self.sHddControllerType)
-                    fRc = fRc and oSession.setStorageControllerPortCount(self.sHddControllerType, 1)
-
+                if self.sHddControllerType == self.ksIdeController:
+                    fRc = fRc and oSession.setStorageControllerPortCount(self.sHddControllerType, 1);
+                else:
+                    random.seed();
+                    self.sHddControllerType = random.choice([self.ksSataController, self.ksScsiController]);
+
+                    if self.sHddControllerType == self.ksSataController:
+                        fRc = fRc and oSession.setStorageControllerType(vboxcon.StorageControllerType_IntelAhci,
+                                                                        self.sHddControllerType);
+                    elif self.sHddControllerType == self.ksScsiController:
+                        fRc = fRc and oSession.setStorageControllerType(vboxcon.StorageControllerType_LsiLogic,
+                                                                        self.sHddControllerType);
                 try:
                     sHddPath = os.path.join(os.path.dirname(oVM.settingsFilePath),