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

Timestamp:

Nov 9, 2021 9:45:38 AM (3 years ago)

Author:

vboxsync

Message:

Audio/Validation Kit: Log started process output to Validation Kit reporter. bugref:10008

File:

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

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

@@ -289 +289 @@
                 asEnvTmp[sKey]   = sValue;
 
-        if  fAsAdmin \
-        and utils.getHostOs() != 'win':
-            oProcess = utils.sudoProcessPopen(asArgs,
-                                              env = asEnvTmp,
-                                              stdout = sys.stdout, stderr = sys.stdout,
-                                              close_fds = False);
-        else:
-            oProcess = utils.processPopenSafe(asArgs,
-                                              env = asEnvTmp,
-                                              stdout = sys.stdout, stderr = sys.stdout);
-        if oProcess:
-            self.pidFileAdd(oProcess.pid, sWhat, fSudo = fAsAdmin);
-            iRc = oProcess.wait();
-            self.pidFileRemove(oProcess.pid);
-
-            if iRc == 0:
-                reporter.log('*** %s: exit code %d' % (sWhat, iRc));
-                fRc = True;
+        try:
+            if  fAsAdmin \
+            and utils.getHostOs() != 'win':
+                sStdOut = utils.sudoProcessOutputChecked(asArgs, env = asEnvTmp);
+                if sStdOut:
+                    sStdOut = sStdOut.strip();
+                    reporter.log("stdout:\n" + sStdOut);
             else:
-                reporter.log('!*! %s: exit code %d' % (sWhat, iRc));
-
-        return fRc;
-
-    def executeHst(self, sWhat, asArgs, asEnv = None, fAsync = False, fAsAdmin = False):
+                (iExit, sStdOut, sStdErr) = utils.processOutputUnchecked(asArgs, env = asEnvTmp);
+
+                if sStdOut:
+                    sStdOut = sStdOut.strip();
+                    reporter.log("stdout:\n" + sStdOut);
+
+                if sStdErr:
+                    sStdErr = sStdErr.strip();
+                    reporter.log("stderr:\n" + sStdErr);
+
+                if iExit == 0:
+                    reporter.log('*** %s: exit code %d' % (sWhat, iExit));
+                    fRc = True;
+                else:
+                    reporter.log('!*! %s: exit code %d' % (sWhat, iExit));
+
+        except:
+            reporter.logXcpt('Executing "%s" failed!' % (sWhat));
+
+        return fRc;
+
+    def executeHst(self, sWhat, asArgs, asEnv = None, fAsAdmin = False):
         """
         Runs a binary (image) with optional admin (root) rights on the host and
@@ -321 +327 @@
         Returns success status (exit code is 0).
         """
-        reporter.log('Executing \"%s\" on host (as admin = %s, async = %s)' % (sWhat, fAsAdmin, fAsync));
-
-        reporter.testStart(sWhat);
+        reporter.log('Executing \"%s\" on host (as admin = %s)' % (sWhat, fAsAdmin));
 
         try:    sys.stdout.flush();
@@ -330 +334 @@
         except: pass;
 
-        fRc = self.executeHstLoop(sWhat, asArgs, asEnv);
+        fRc = self.executeHstLoop(sWhat, asArgs, asEnv, fAsAdmin);
         if fRc:
             reporter.log('Executing \"%s\" on host done' % (sWhat,));
         else:
             reporter.log('Executing \"%s\" on host failed' % (sWhat,));
-
-        reporter.testDone();
 
         return fRc;