Changeset 70738 in vbox

Timestamp:

Jan 25, 2018 11:33:44 AM (7 years ago)

Author:

vboxsync

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

120497

Message:

ValidationKit/testdriver: Enable audio by default now.

Location:

trunk/src/VBox/ValidationKit

Files:

• testdriver/vbox.py (modified) (1 diff)
• testdriver/vboxwrappers.py (modified) (3 diffs)
• tests/smoketests/tdSmokeTest1.py (modified) (1 diff)

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

@@ -2014 +2014 @@
         elif oAudioAdapter.audioController == vboxcon.AudioControllerType_HDA:  sType = "HDA";
         else: sType = "unknown %s" % (oAudioAdapter.audioController);
-        reporter.log("    AudioController: %s" % (sType));
-        reporter.log("    AudioEnabled: %s" % (oAudioAdapter.enabled));
-        if   oAudioAdapter.audioDriver == vboxcon.AudioDriverType_CoreAudio: sType = "CoreAudio";
-        elif oAudioAdapter.audioDriver == vboxcon.AudioDriverType_DirectSound: sType = "DirectSound";
-        elif oAudioAdapter.audioDriver == vboxcon.AudioDriverType_Pulse: sType = "PulseAudio";
-        elif oAudioAdapter.audioDriver == vboxcon.AudioDriverType_OSS: sType = "OSS";
-        elif oAudioAdapter.audioDriver == vboxcon.AudioDriverType_Null: sType = "NULL";
+        reporter.log("    AudioController:  %s" % (sType));
+        reporter.log("    AudioEnabled:     %s" % (oAudioAdapter.enabled));
+        if   oAudioAdapter.audioDriver == vboxcon.AudioDriverType_CoreAudio:    sType = "CoreAudio";
+        elif oAudioAdapter.audioDriver == vboxcon.AudioDriverType_DirectSound:  sType = "DirectSound";
+        elif oAudioAdapter.audioDriver == vboxcon.AudioDriverType_Pulse:        sType = "PulseAudio";
+        elif oAudioAdapter.audioDriver == vboxcon.AudioDriverType_OSS:          sType = "OSS";
+        elif oAudioAdapter.audioDriver == vboxcon.AudioDriverType_Null:         sType = "NULL";
         else: sType = "unknown %s" % (oAudioAdapter.audioDriver);
         reporter.log("    Host AudioDriver: %s" % (sType));

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

@@ -2048 +2048 @@
     def setupNic(self, sType, sXXX):
         """
-        Attaches a HD to a VM.
+        Sets up a NIC to a VM.
         Returns True on success and False on failure.  Error information is logged.
         """
@@ -2064 +2064 @@
         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;
-
+    def setupAudio(self, eAudioControllerType, fEnable = True, eAudioDriverType = None):
+        """
+        Sets up audio.
+
+        :param eAudioControllerType:    The audio controller type (vboxcon.AudioControllerType_XXX).
+        :param fEnable:                 Whether to enable or disable the audio controller (default enable).
+        :param eAudioDriverType:        The audio driver type (vboxcon.AudioDriverType_XXX), picks something suitable
+                                        if None is passed (default).
+        """
+        try:    oAudioAdapter = self.o.machine.audioAdapter;
+        except: return reporter.errorXcpt('Failed to get the audio adapter.');
+
+        try:    oAudioAdapter.audioController = eAudioControllerType;
+        except: return reporter.errorXcpt('Failed to set the audio controller to %s.' % (eAudioControllerType,));
+
+        if eAudioDriverType is None:
             sHost = utils.getHostOs()
-            if   sHost == 'darwin':    oAudioAdapter.audioDriver = vboxcon.AudioDriverType_CoreAudio;
-            elif sHost == 'win':       oAudioAdapter.audioDriver = vboxcon.AudioDriverType_DirectSound;
-            elif sHost == 'linux':     oAudioAdapter.audioDriver = vboxcon.AudioDriverType_Pulse;
-            elif sHost == 'solaris':   oAudioAdapter.audioDriver = vboxcon.AudioDriverType_OSS;
-            else:
-                reporter.error('Unsupported host "%s".' % (sHost,));
-                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))
+            if   sHost == 'darwin':    eAudioDriverType = vboxcon.AudioDriverType_CoreAudio;
+            elif sHost == 'win':       eAudioDriverType = vboxcon.AudioDriverType_DirectSound;
+            elif sHost == 'linux':     eAudioDriverType = vboxcon.AudioDriverType_Pulse;
+            elif sHost == 'solaris':   eAudioDriverType = vboxcon.AudioDriverType_OSS;
+            else:
+                reporter.error('PORTME: Do not know which audio driver to pick for: %s!' % (sHost,));
+                eAudioDriverType = vboxcon.AudioDriverType_Null;
+
+        try:    oAudioAdapter.audioDriver = eAudioDriverType;
+        except: return reporter.errorXcpt('Failed to set the audio driver to %s.' % (eAudioDriverType,))
+
+        try:    oAudioAdapter.enabled = fEnable;
+        except: return reporter.errorXcpt('Failed to set the "enabled" property to %s.' % (fEnable,));
+
+        reporter.log('set audio adapter type to %d, driver to %d, and enabled to %s'
+                     % (eAudioControllerType, eAudioDriverType, fEnable,));
         self.oTstDrv.processPendingEvents();
-
-        return True
+        return True;
 
     def setupPreferredConfig(self):                                             # pylint: disable=R0914
@@ -2165 +2171 @@
                 fRc = False;
         if self.fpApiVer >= 4.0:
-            if not self.setupAudio(eAudioCtlType): fRc = False;
+            if not self.setupAudio(eAudioCtlType):      fRc = False;
 
         return fRc;

trunk/src/VBox/ValidationKit/tests/smoketests/tdSmokeTest1.py

@@ -142 +142 @@
         """
 
-        oSession = self.openSession(oVM);
-
-        # Enable audio adapter
-        oSession.o.machine.audioAdapter.enabled = True;
-
-        fRc = oSession.saveSettings();
-        fRc = fRc and oSession.close();
-        assert fRc is True;
-
         # Simple test.
         self.logVmInfo(oVM);