Changeset 100845 in vbox for trunk

Timestamp:

Aug 9, 2023 9:00:37 PM (19 months ago)

Author:

vboxsync

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

158746

Message:

ValKit/testdriver/base.py: Use utils.processCheckPidAndName for implementing processCheckPidAndName. That one is clean of pylint warnings.

File:

• trunk/src/VBox/ValidationKit/testdriver/base.py (modified) (2 diffs)

trunk/src/VBox/ValidationKit/testdriver/base.py

@@ -47 +47 @@
 import socket
 import stat
-import subprocess
 import sys
 import time
@@ -281 +280 @@
     Checks if a process PID and NAME matches.
     """
-    if sys.platform == 'win32':
-        fRc = winbase.processCheckPidAndName(uPid, sName);
-    else:
-        sOs = utils.getHostOs();
-        if sOs == 'linux':
-            asPsCmd = ['/bin/ps',     '-p', '%u' % (uPid,), '-o', 'fname='];
-        elif sOs == 'solaris':
-            asPsCmd = ['/usr/bin/ps', '-p', '%u' % (uPid,), '-o', 'fname='];
-        elif sOs == 'darwin':
-            asPsCmd = ['/bin/ps',     '-p', '%u' % (uPid,), '-o', 'ucomm='];
-        else:
-            asPsCmd = None;
-
-        if asPsCmd is not None:
-            try:
-                oPs = subprocess.Popen(asPsCmd, stdout=subprocess.PIPE); # pylint: disable=consider-using-with
-                sCurName = oPs.communicate()[0];
-                iExitCode = oPs.wait();
-            except:
-                reporter.logXcpt();
-                return False;
-
-            # ps fails with non-zero exit code if the pid wasn't found.
-            if iExitCode != 0:
-                return False;
-            if sCurName is None:
-                return False;
-            sCurName = sCurName.strip();
-            if sCurName == '':
-                return False;
-
-            if os.path.basename(sName) == sName:
-                sCurName = os.path.basename(sCurName);
-            elif os.path.basename(sCurName) == sCurName:
-                sName = os.path.basename(sName);
-
-            if sCurName != sName:
-                return False;
-
-            fRc = True;
-    return fRc;
+    return utils.processCheckPidAndName(uPid, sName);
 
 def wipeDirectory(sDir):