Changeset 70575 in vbox

Timestamp:

Jan 13, 2018 2:28:28 PM (7 years ago)

Author:

vboxsync

Message:

ValidationKit: More python 3 adjustments.

Location:

trunk/src/VBox/ValidationKit

Files:

• common/utils.py (modified) (1 diff)
• testdriver/base.py (modified) (1 diff)
• testdriver/vbox.py (modified) (1 diff)

trunk/src/VBox/ValidationKit/common/utils.py

@@ -859 +859 @@
             pass;
     else:
-        if sys.platform in ('linux2', ):
+        if sys.platform in ('linux2', 'linux', 'linux3', 'linux4', 'linux5', 'linux6'):
             asPsCmd = ['/bin/ps',     '-p', '%u' % (uPid,), '-o', 'fname='];
         elif sys.platform in ('sunos5',):

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

@@ -287 +287 @@
         fRc = winbase.processCheckPidAndName(uPid, sName);
     else:
-        if sys.platform in ('linux2', ):
+        sOs = utils.getHostOs();
+        if sOs == 'linux':
             asPsCmd = ['/bin/ps',     '-p', '%u' % (uPid,), '-o', 'fname='];
-        elif sys.platform in ('sunos5',):
+        elif sOs == 'solaris':
             asPsCmd = ['/usr/bin/ps', '-p', '%u' % (uPid,), '-o', 'fname='];
-        elif sys.platform in ('darwin',):
+        elif sOs == 'darwin':
             asPsCmd = ['/bin/ps',     '-p', '%u' % (uPid,), '-o', 'ucomm='];
         else:

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

@@ -1070 +1070 @@
                 #
                 iPipeR, iPipeW = os.pipe();
+                if hasattr(os, 'set_inheritable'):
+                    os.set_inheritable(iPipeW, fTrue);             # pylint: disable=no-member
                 os.environ['NSPR_INHERIT_FDS'] = 'vboxsvc:startup-pipe:5:0x%x' % (iPipeW,);
                 reporter.log2("NSPR_INHERIT_FDS=%s" % (os.environ['NSPR_INHERIT_FDS']));