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

Timestamp:

Dec 7, 2015 8:33:47 PM (9 years ago)

Author:

vboxsync

Message:

Setup audio controller type as recommended for specified OSType. Enabled it only for installation tests.

Location:

trunk/src/VBox/ValidationKit

Files:

• testdriver/vboxwrappers.py (modified) (3 diffs)
• tests/installation/tdGuestOsInstTest1.py (modified) (1 diff)

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

@@ -1908 +1908 @@
         return True;
 
+    def setupAudio(self, eAudioCtlType):
+        """
+        Set guest audio controller type and host audio adapter to null
+        @param eAudioCtlType device type (vboxcon.AudioControllerType_SB16,
+                             vboxcon.AudioControllerType_AC97, vboxcon.AudioControllerType_HDA)
+        """
+        try:
+            oAudioAdapter = self.o.machine.audioAdapter;
+
+            oAudioAdapter.audioController = eAudioCtlType;
+            oAudioAdapter.audioDriver = vboxcon.AudioDriverType_Null;
+            # Disable by default
+            oAudioAdapter.enabled = False;
+        except:
+            return reporter.errorXcpt('Unable to set audio adapter.')
+
+        reporter.log('set audio adapter type to %d' % (eAudioCtlType))
+        self.oTstDrv.processPendingEvents();
+
+        return True
+
     def setupPreferredConfig(self):                                             # pylint: disable=R0914
         """
@@ -1952 +1973 @@
                 eFirmwareType   = -1;
                 eStorCtlType    = vboxcon.StorageControllerType_PIIX4;
+            if self.fpApiVer >= 4.0:
+                eAudioCtlType   = oOsType.recommendedAudioController;
         except:
             reporter.errorXcpt('exception reading IGuestOSType(%s) attribute' % (sOsTypeId));
@@ -1976 +1999 @@
             if not self.setStorageControllerType(eStorCtlType, "IDE Controller"):
                 fRc = False;
+        if self.fpApiVer >= 4.0:
+            if not self.setupAudio(eAudioCtlType): fRc = False;
 
         return fRc;

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

@@ -172 +172 @@
                     reporter.log('Set extradata: %s => %s' % (sKey, sValue))
                     fRc = fRc and oSession.setExtraData(sKey, sValue)
+
+                # Enable audio adapter
+                oSession.o.machine.audioAdapter.enabled = True;
 
                 # Other variations?