Changeset 90684 in vbox for trunk/src/VBox/ValidationKit/tests

Timestamp:

Aug 13, 2021 1:38:57 PM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

146296

Message:

Audio/ValKit: tdAudioTest.py: Factored out running host binaries into executeHstBinaryAsAdmin() and also make use of it when killing host processes to catch (std[err|out]) errors. ​bugref:10008

File:

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

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

@@ -207 +207 @@
         return (False, "");
 
+    def executeHstBinaryAsAdmin(self, sWhat, asArgs):
+        """
+        Runs a binary (image) with admin (root) rights on the host.
+
+        Returns success status (exit code is 0).
+        """
+        fRc      = False;
+        oProcess = utils.sudoProcessPopen(asArgs, stdout=subprocess.PIPE, stdin=subprocess.PIPE,
+                                          stderr=subprocess.PIPE, shell = False, close_fds = False);
+        if oProcess:
+            sOut, sErr = oProcess.communicate();
+
+            sOut = sOut.decode(sys.stdin.encoding);
+            for sLine in sOut.split('\n'):
+                reporter.log(sLine);
+
+            sErr = sErr.decode(sys.stdin.encoding);
+            for sLine in sErr.split('\n'):
+                reporter.log(sLine);
+
+            iExitCode = oProcess.poll();
+            if iExitCode == 0:
+                fRc = True;
+            else:
+                reporter.error('%s on host returned exit code error %d' % (sWhat, iExitCode));
+        else:
+            fRc = False;
+
+        if not fRc:
+            reporter.error('%s on host failed' % (sWhat,));
+
+        return fRc;
+
     def killHstProcessByName(self, sProcName):
         """
@@ -213 +246 @@
         reporter.log('Trying to kill processes named "%s"' % (sProcName,));
         if sys.platform == 'win32':
-            os.system('taskkill /IM "%s.exe" /F' % (sProcName));
+            sArgProcName = '\"%s.exe\"' % sProcName;
+            asArgs       = [ 'taskkill', '/IM', sArgProcName, '/F' ];
+            self.executeHstBinaryAsAdmin('Killing process', asArgs);
         else: # Note: killall is not available on older Debians (requires psmisc).
             # Using the BSD syntax here; MacOS also should understand this.
@@ -302 +337 @@
             #        Windows hosts than Vista.
             asArgs = self.getWinFirewallArgsDisable('vista');
-
-        if asArgs:
-            oProcess = utils.sudoProcessPopen(asArgs, stdout=subprocess.PIPE, stdin=subprocess.PIPE,
-                                              stderr=subprocess.PIPE, shell = False, close_fds = False);
-            if oProcess:
-                sOut, sErr = oProcess.communicate();
-
-                sOut = sOut.decode(sys.stdin.encoding);
-                for sLine in sOut.split('\n'):
-                    reporter.log(sLine);
-
-                sErr = sErr.decode(sys.stdin.encoding);
-                for sLine in sErr.split('\n'):
-                    reporter.log(sLine);
-
-                iExitCode = oProcess.poll();
-                if iExitCode == 0:
-                    fRc = True;
-                else:
-                    reporter.error('Disabling firewall on host returned exit code error %d' % iExitCode);
-            else:
-                fRc = False;
-
-            if not fRc:
-                reporter.error('Disabling firewall on host failed');
+            if asArgs:
+                fRc = self.executeHstBinaryAsAdmin('Disabling firewall', asArgs);
         else:
             reporter.log('Firewall not available on host, skipping');