Changeset 103348 in vbox for trunk/src/VBox/ValidationKit/tests/audio/tdAudioTest.py

Timestamp:

Feb 14, 2024 10:03:01 AM (12 months ago)

Author:

vboxsync

Message:

Validation Kit/tdAudioTest: More bugfixes for Python 2.x on the testboxes.

File:

• trunk/src/VBox/ValidationKit/tests/audio/tdAudioTest.py (modified) (6 diffs)

trunk/src/VBox/ValidationKit/tests/audio/tdAudioTest.py

@@ -329 +329 @@
             iRc  = 0;
 
-            # For Python 3.x we provide "real-time" output.
             if sys.version_info[0] >= 3:
                 while oProcess.stdout.readable(): # pylint: disable=no-member
@@ -335 +334 @@
                     if sStdOut:
                         sStdOut = sStdOut.strip();
-                        reporter.log('%s: %s' % (sWhat, sStdOut));
+                        reporter.log('%s: %s' % (sWhat, sStdOut.rstrip('\n')));
+                    self.processEvents(0);
                     iRc = oProcess.poll();
                     if iRc is not None:
                         break;
-            else:
-                # For Python 2.x it's too much hassle to set the file descriptor options (O_NONBLOCK) and stuff,
-                # so just use communicate() here and dump everythiong all at once when finished.
-                sStdOut = oProcess.communicate();
-                if sStdOut:
-                    reporter.log('%s: %s' % (sWhat, sStdOut));
-                iRc = oProcess.poll();
+            else: # Python 2.x cruft.
+                while True:
+                    sStdOut = oProcess.stdout.readline();
+                    if  sStdOut == '' \
+                    and oProcess.poll() is not None:
+                        break;
+                    self.processEvents(0);
+                    reporter.log('%s [stdout]: %s' % (sWhat, sStdOut.rstrip('\n'),));
 
             if iRc == 0:
@@ -370 +371 @@
         return self.executeHstLoop(sWhat, asArgs, asEnv, fAsAdmin);
 
-    def executeHst(self, sWhat, asArgs, asEnv = None, fAsAdmin = False, fBlocking = False):
+    def executeHst(self, sWhat, asArgs, asEnv = None, fAsAdmin = False, fBlocking = True):
         """
         Runs a binary (image) with optional admin (root) rights on the host and
@@ -389 +390 @@
         except: pass;
 
-        if not fBlocking: # Run in same thread (blocking).
+        if fBlocking: # Run in same thread (blocking).
             fRc = self.executeHstLoop(sWhat, asArgs, asEnv, fAsAdmin);
         else: # Run in separate thread (asynchronous).
@@ -596 +597 @@
         reporter.log('Using VKAT on host at: \"%s\"' % (sVkatExe));
 
-        # Run the VKAT self test.
-        # Doesn't take long and gives us some more clue if it flies on the testboxes.
-        reporter.testStart('VKAT Selftest');
-        fRc = self.executeHst("VKAT Host Selftest", [ sVkatExe, 'selftest' ], fBlocking = True);
-        reporter.testDone();
-        if not fRc:
-            return fRc;
-
         reporter.testStart(sDesc);
 
@@ -738 +731 @@
         if  not fSkip \
         and self.fpApiVer < 7.0:
-            reporter.log('Audio testing for non-trunk builds skipped.');
+            reporter.log('Audio testing not available for this branch, skipping.');
             fSkip = True;
-
-        reporter.log('Verbosity level is: %d' % (reporter.getVerbosity(),));
-
-        if not fSkip:
-            sVkatExe = self.getBinTool('vkat');
-            asArgs   = [ sVkatExe, 'enum', '--probe-backends' ];
-            for _ in range(1, reporter.getVerbosity()): # Verbosity always is initialized at 1.
-                asArgs.extend([ '-v' ]);
-            fRc      = self.executeHst("VKAT Host Audio Probing", asArgs);
-            if not fRc:
-                # Not fatal, as VBox then should fall back to the NULL audio backend (also worth having as a test case).
-                reporter.log('Warning: Backend probing on host failed, no audio available (pure server installation?)');
 
         if fSkip:
             reporter.testDone(fSkipped = True);
             return True;
+
+        reporter.log('Verbosity level is: %d' % (reporter.getVerbosity(),));
+
+        sVkatExe = self.getBinTool('vkat');
+
+        # Run the VKAT self test.
+        # Doesn't take long and gives us some more clue if it flies on the testboxes.
+        reporter.testStart('VKAT Selftest');
+        fRc = self.executeHst("VKAT Host Selftest", [ sVkatExe, 'selftest' ]);
+        reporter.testDone();
+        if not fRc:
+            return fRc;
+
+        # Now probe the backends.
+        asArgs   = [ sVkatExe, 'enum', '--probe-backends' ];
+        for _ in range(1, reporter.getVerbosity()): # Verbosity always is initialized at 1.
+            asArgs.extend([ '-v' ]);
+        fRc      = self.executeHst("VKAT Host Audio Probing", asArgs);
+        if not fRc:
+            # Not fatal, as VBox then should fall back to the NULL audio backend (also worth having as a test case).
+            reporter.log('Warning: Backend probing on host failed, no audio available (pure server installation?)');
 
         # Reconfigure the VM.