Changeset 59607 in vbox

Timestamp:

Feb 8, 2016 7:59:30 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

105430

Message:

Switched controller type to SCSI for Debian7 and Fedora18

File:

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

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

@@ -34 +34 @@
 import os
 import sys
-import random
 
 
@@ -139 +138 @@
             oSession = oTestDrv.openSession(oVM);
             if oSession is not None:
-                if self.sHddControllerType == self.ksIdeController:
+                if self.sHddControllerType == self.ksSataController:
+                    fRc = fRc and oSession.setStorageControllerType(vboxcon.StorageControllerType_IntelAhci,
+                                                                    self.sHddControllerType);
+                elif self.ksScsiController:
+                    fRc = fRc and oSession.setStorageControllerType(vboxcon.StorageControllerType_LsiLogic,
+                                                                    self.sHddControllerType);
+                else:
                     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),
@@ -265 +260 @@
             InstallTestVm(oSet, 'tst-fedora9',      'Fedora',           'fedora9-txs.iso',          InstallTestVm.ksSataController,  8, InstallTestVm.kf32Bit),
             InstallTestVm(oSet, 'tst-fedora18-64',  'Fedora_64',        'fedora18-x64-txs.iso',     InstallTestVm.ksSataController,  8, InstallTestVm.kf64Bit),
-            InstallTestVm(oSet, 'tst-fedora18',     'Fedora',           'fedora18-txs.iso',         InstallTestVm.ksSataController,  8, InstallTestVm.kf32Bit),
+            InstallTestVm(oSet, 'tst-fedora18',     'Fedora',           'fedora18-txs.iso',         InstallTestVm.ksScsiController,  8, InstallTestVm.kf32Bit),
             InstallTestVm(oSet, 'tst-ols6',         'Oracle',           'ols6-i386-txs.iso',        InstallTestVm.ksSataController, 12, InstallTestVm.kf32Bit | InstallTestVm.kfReqPae),
             InstallTestVm(oSet, 'tst-ols6-64',      'Oracle_64',        'ols6-x86_64-txs.iso',      InstallTestVm.ksSataController, 12, InstallTestVm.kf64Bit),
@@ -280 +275 @@
             InstallTestVm(oSet, 'tst-ubuntu1404-64','Ubuntu_64',        'ubuntu1404-amd64-txs.iso', InstallTestVm.ksSataController,  8, InstallTestVm.kf64Bit),
             InstallTestVm(oSet, 'tst-debian7',      'Debian',           'debian-7.0.0-txs.iso',     InstallTestVm.ksSataController,  8, InstallTestVm.kf32Bit),
-            InstallTestVm(oSet, 'tst-debian7-64',   'Debian_64',        'debian-7.0.0-x64-txs.iso', InstallTestVm.ksSataController,  8, InstallTestVm.kf64Bit),
+            InstallTestVm(oSet, 'tst-debian7-64',   'Debian_64',        'debian-7.0.0-x64-txs.iso', InstallTestVm.ksScsiController,  8, InstallTestVm.kf64Bit),
             InstallTestVm(oSet, 'tst-w7-64',        'Windows7_64',      'win7-x64-txs.iso',         InstallTestVm.ksSataController, 25, InstallTestVm.kf64Bit),
             InstallTestVm(oSet, 'tst-w7-32',        'Windows7',         'win7-x86-txs.iso',         InstallTestVm.ksSataController, 25, InstallTestVm.kf32Bit),