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

Timestamp:

Jun 29, 2022 2:07:34 PM (3 years ago)

Author:

vboxsync

Message:

Audio/Main: Adjustments for Validation Kit. bugref:10050

Location:

trunk/src/VBox/ValidationKit/testdriver

Files:

• vbox.py (modified) (1 diff)
• vboxwrappers.py (modified) (2 diffs)

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

@@ -2177 +2177 @@
         for oCtrl in aoControllers:
             reporter.log("    %s %s bus: %s type: %s" % (oCtrl.name, oCtrl.controllerType, oCtrl.bus, oCtrl.controllerType,));
+        if self.fpApiVer >= 7.0:
+            oAdapter = oVM.audioSettings.adapter;
+        else:
+            oAdapter = oVM.audioAdapter;
         reporter.log("    AudioController:  %s"
-                     % (self.oVBoxMgr.getEnumValueName('AudioControllerType', oVM.audioAdapter.audioController),));               # pylint: disable=not-callable
-        reporter.log("    AudioEnabled:     %s" % (oVM.audioAdapter.enabled,));
+                     % (self.oVBoxMgr.getEnumValueName('AudioControllerType', oAdapter.audioController),));               # pylint: disable=not-callable
+        reporter.log("    AudioEnabled:     %s" % (oAdapter.enabled,));
         reporter.log("    Host AudioDriver: %s"
-                     % (self.oVBoxMgr.getEnumValueName('AudioDriverType', oVM.audioAdapter.audioDriver),));                       # pylint: disable=not-callable
+                     % (self.oVBoxMgr.getEnumValueName('AudioDriverType', oAdapter.audioDriver),));                       # pylint: disable=not-callable
 
         self.processPendingEvents();

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

@@ -2249 +2249 @@
                                         if None is passed (default).
         """
-        try:    oAudioAdapter = self.o.machine.audioAdapter;
+        try:
+            if self.fpApiVer >= 7.0:
+                oAdapter = self.o.machine.audioSettings.adapter;
+            else:
+                oAdapter = self.o.machine.audioAdapter;
         except: return reporter.errorXcpt('Failed to get the audio adapter.');
 
-        try:    oAudioAdapter.audioController = eAudioControllerType;
+        try:    oAdapter.audioController = eAudioControllerType;
         except: return reporter.errorXcpt('Failed to set the audio controller to %s.' % (eAudioControllerType,));
 
@@ -2265 +2269 @@
                 eAudioDriverType = vboxcon.AudioDriverType_Null;
 
-        try:    oAudioAdapter.audioDriver = eAudioDriverType;
+        try:    oAdapter.audioDriver = eAudioDriverType;
         except: return reporter.errorXcpt('Failed to set the audio driver to %s.' % (eAudioDriverType,))
 
-        try:    oAudioAdapter.enabled = fEnable;
+        try:    oAdapter.enabled = fEnable;
         except: return reporter.errorXcpt('Failed to set the "enabled" property to %s.' % (fEnable,));
 
-        try:    oAudioAdapter.enabledIn = fEnableIn;
+        try:    oAdapter.enabledIn = fEnableIn;
         except: return reporter.errorXcpt('Failed to set the "enabledIn" property to %s.' % (fEnable,));
 
-        try:    oAudioAdapter.enabledOut = fEnableOut;
+        try:    oAdapter.enabledOut = fEnableOut;
         except: return reporter.errorXcpt('Failed to set the "enabledOut" property to %s.' % (fEnable,));