Changeset 103379 in vbox

Timestamp:

Feb 15, 2024 9:16:36 AM (10 months ago)

Author:

vboxsync

Message:

Validation Kit/tdAudioTest: Compacted code within executeHstLoop() a bit, as differences for Python 2 / 3 are minimal.

File:

• trunk/src/VBox/ValidationKit/tests/audio/tdAudioTest.py (modified) (1 diff)

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

@@ -329 +329 @@
             iRc  = 0;
 
-            if sys.version_info[0] >= 3:
-                while oProcess.stdout.readable(): # pylint: disable=no-member
-                    sStdOut = oProcess.stdout.readline();
-                    if sStdOut:
-                        sStdOut = sStdOut.strip();
-                        reporter.log('%s: %s' % (sWhat, sStdOut.rstrip('\n')));
-                    self.processEvents(0);
-                    iRc = oProcess.poll();
-                    if iRc is not None:
-                        break;
-            else: # Python 2.x cruft.
-                while True:
-                    sStdOut = oProcess.stdout.readline();
-                    if  sStdOut == '' \
-                    and oProcess.poll() is not None:
-                        break;
-                    self.processEvents(0);
+            while True if sys.version_info[0] < 3 else oProcess.stdout.readable(): # pylint: disable=no-member
+                sStdOut = oProcess.stdout.readline();
+                if sStdOut:
+                    sStdOut = sStdOut.strip();
                     reporter.log('%s [stdout]: %s' % (sWhat, sStdOut.rstrip('\n'),));
+                self.processEvents(0);
+                iRc = oProcess.poll();
+                if iRc is not None:
+                    break;
 
             if iRc == 0: