Changeset 90129 in vbox

Timestamp:

Jul 9, 2021 2:33:26 PM (4 years ago)

Author:

vboxsync

Message:

Audio/ValKit: More fixes and additions for the Validation Kit test driver. bugref:10008

File:

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

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

@@ -166 +166 @@
         return (False, "");
 
+    def killProcessByName(self, sProcName):
+        """
+        Kills processes by their name.
+        """
+        if sys.platform == 'win32':
+            os.system('taskkill /IM "%s.exe" /F' % (sProcName));
+        else:
+            os.system('killall -9 %s' % (sProcName));
+
+    def killHstVkat(self):
+        """
+        Kills VKAT (VBoxAudioTest) on the host side.
+        """
+        self.killProcessByName("vkat");
+        self.killProcessByName("VBoxAudioTest");
+
     def _getVkatResult(self, oTxsSession):
         """
@@ -181 +197 @@
         Starts VKAT on the guest (running in background).
         """
-        sDesc          = 'Starting VKAT on guest';
-
         sPathTemp      = self.getGuestTempDir(oTestVm);
         sPathAudioOut  = oTestVm.pathJoin(sPathTemp, 'vkat-guest-out');
@@ -202 +216 @@
             aArgs.extend(['--daemonize']);
 
-            fRc = self.txsRunTest(oTxsSession, sDesc, 15 * 60 * 1000,
+            fRc = self.txsRunTest(oTxsSession, 'Starting VKAT on guest', 15 * 60 * 1000,
                                   sVkatExe, aArgs);
             if not fRc:
                 reporter.error('VKAT on guest returned exit code error %d' % (self._getVkatResult(oTxsSession)));
+        else:
+            reporter.error('VKAT on guest not found');
 
         return fRc;
@@ -245 +261 @@
         #
         procVkat = subprocess.Popen(sArgs, \
-                                    stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True);
+                                    stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True);
         if procVkat:
-            while procVkat.poll() is None:
-                sLine = procVkat.stdout.readline().rstrip();
-                if sLine:
-                    reporter.log(sLine);
-
-            if procVkat.returncode != 0:
-                reporter.testFailure('VKAT on the host failed with exit code %d' % (procVkat.returncode));
+            reporter.log('VKAT on host started');
+
+            out, err = procVkat.communicate();
+            rc = procVkat.poll();
+
+            out = out.decode(sys.stdin.encoding);
+            for line in out.split('\n'):
+                reporter.log(line);
+
+            err = err.decode(sys.stdin.encoding);
+            for line in err.split('\n'):
+                reporter.log(line);
+
+            reporter.log('VKAT on host ended with exit code %d' % rc);
+            if rc != 0:
+                reporter.testFailure('VKAT on the host failed');
                 fRc = False;
         else:
@@ -267 +292 @@
         Executes the specified audio tests.
         """
+
+        # First try to kill any old VKAT / VBoxAudioTest processes lurking around on the host.
+        # Might happen because of former (aborted) runs.
+        self.killHstVkat();
+
         fRc = self.startVkatOnGuest(oTestVm, oSession, oTxsSession);
         if fRc: