Changeset 65196 in vbox for trunk

Timestamp:

Jan 9, 2017 11:07:28 AM (8 years ago)

Author:

vboxsync

Message:

common/utils.py,testboxscript,tdUnitTest1: Create separate windows (console) process groups for children so we can safely generate Ctrl-C signals without also committing suicide. (testdriver.base.spawn already did this)

Location:

trunk/src/VBox/ValidationKit

Files:

• common/utils.py (modified) (4 diffs)
• testboxscript/testboxscript.py (modified) (5 diffs)
• testboxscript/testboxtasks.py (modified) (1 diff)
• tests/unittests/tdUnitTest1.py (modified) (1 diff)

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

@@ -435 +435 @@
     return None;
 
+def processPopenSafe(*aPositionalArgs, **dKeywordArgs):
+    """
+    Wrapper for subprocess.Popen that's Ctrl-C safe on windows.
+    """
+    if getHostOs() == 'win':
+        if dKeywordArgs.get('creationflags', 0) == 0:
+            dKeywordArgs['creationflags'] = subprocess.CREATE_NEW_PROCESS_GROUP;
+    return subprocess.Popen(*aPositionalArgs, **dKeywordArgs);
+
 def processCall(*aPositionalArgs, **dKeywordArgs):
     """
-    Wrapper around subprocess.call to deal with its absense in older
+    Wrapper around subprocess.call to deal with its absence in older
     python versions.
     Returns process exit code (see subprocess.poll).
@@ -444 +453 @@
     assert dKeywordArgs.get('stderr') is None;
     _processFixPythonInterpreter(aPositionalArgs, dKeywordArgs);
-    oProcess = subprocess.Popen(*aPositionalArgs, **dKeywordArgs);
+    oProcess = processPopenSafe(*aPositionalArgs, **dKeywordArgs);
     return oProcess.wait();
 
@@ -453 +462 @@
     """
     _processFixPythonInterpreter(aPositionalArgs, dKeywordArgs);
-    oProcess = subprocess.Popen(stdout=subprocess.PIPE, *aPositionalArgs, **dKeywordArgs);
+    oProcess = processPopenSafe(stdout=subprocess.PIPE, *aPositionalArgs, **dKeywordArgs);
 
     sOutput, _ = oProcess.communicate();
@@ -541 +550 @@
 def sudoProcessPopen(*aPositionalArgs, **dKeywordArgs):
     """
-    sudo (or similar) + subprocess.Popen.
+    sudo (or similar) + processPopenSafe.
     """
     _processFixPythonInterpreter(aPositionalArgs, dKeywordArgs);
     _sudoFixArguments(aPositionalArgs, dKeywordArgs);
-    return subprocess.Popen(*aPositionalArgs, **dKeywordArgs);
+    return processPopenSafe(*aPositionalArgs, **dKeywordArgs);
 
 

trunk/src/VBox/ValidationKit/testboxscript/testboxscript.py

@@ -33 +33 @@
 __version__ = "$Revision$"
 
-import subprocess
-import sys
-import os
-import time
+import platform;
+import subprocess;
+import sys;
+import os;
+import time;
 
 
@@ -42 +43 @@
 # @remarks These will _never_ change
 # @{
-TBS_EXITCODE_FAILURE        = 1         # RTEXITCODE_FAILURE
-TBS_EXITCODE_SYNTAX         = 2         # RTEXITCODE_SYNTAX
-TBS_EXITCODE_NEED_UPGRADE   = 9
+TBS_EXITCODE_FAILURE        = 1;        # RTEXITCODE_FAILURE
+TBS_EXITCODE_SYNTAX         = 2;        # RTEXITCODE_SYNTAX
+TBS_EXITCODE_NEED_UPGRADE   = 9;
 ## @}
 
@@ -59 +60 @@
         Init
         """
-        self.task = None
+        self.oTask = None
 
     def __del__(self):
@@ -65 +66 @@
         Cleanup
         """
-        if self.task is not None:
+        if self.oTask is not None:
             print 'Wait for child task...'
-            self.task.terminate()
-            self.task.wait()
+            self.oTask.terminate()
+            self.oTask.wait()
             print 'done. Exiting'
-            self.task = None;
+            self.oTask = None;
 
     def run(self):
@@ -107 +108 @@
         rcExit = TBS_EXITCODE_FAILURE;
         while True:
-            self.task = subprocess.Popen(asArgs, shell=False);
-            rcExit = self.task.wait();
-            self.task = None;
+            self.oTask = subprocess.Popen(asArgs,
+                                          shell = False,
+                                          creationflags = (0 if platform.system() != 'Windows'
+                                                           else subprocess.CREATE_NEW_PROCESS_GROUP)); # for Ctrl-C isolation
+            rcExit = self.oTask.wait();
+            self.oTask = None;
             if rcExit == TBS_EXITCODE_SYNTAX:
                 break;

trunk/src/VBox/ValidationKit/testboxscript/testboxtasks.py

@@ -423 +423 @@
         # Spawn child.
         try:
-            oChild = subprocess.Popen(asArgs,
-                                      shell      = False,
-                                      bufsize    = -1,
-                                      stdout     = subprocess.PIPE,
-                                      stderr     = subprocess.STDOUT,
-                                      cwd        = self._oTestBoxScript.getPathSpill(),
-                                      universal_newlines = True,
-                                      close_fds  = (False if utils.getHostOs() == 'win' else True),
-                                      preexec_fn = (None if utils.getHostOs() in ['win', 'os2']
-                                                    else os.setsid)); # pylint: disable=E1101
+            oChild = utils.processPopenSafe(asArgs,
+                                            shell      = False,
+                                            bufsize    = -1,
+                                            stdout     = subprocess.PIPE,
+                                            stderr     = subprocess.STDOUT,
+                                            cwd        = self._oTestBoxScript.getPathSpill(),
+                                            universal_newlines = True,
+                                            close_fds  = (False if utils.getHostOs() == 'win' else True),
+                                            preexec_fn = (None if utils.getHostOs() in ['win', 'os2']
+                                                          else os.setsid)); # pylint: disable=E1101
         except Exception, oXcpt:
             self._log('Error creating child process %s: %s' % (asArgs, oXcpt));

trunk/src/VBox/ValidationKit/tests/unittests/tdUnitTest1.py

@@ -633 +633 @@
                     oChild = utils.sudoProcessPopen(asArgs, stdin = oDevNull, stdout = sys.stdout, stderr = sys.stdout);
                 else:
-                    oChild = subprocess.Popen(      asArgs, stdin = oDevNull, stdout = sys.stdout, stderr = sys.stdout);
+                    oChild = utils.processPopenSafe(asArgs, stdin = oDevNull, stdout = sys.stdout, stderr = sys.stdout);
             except:
                 if sName in [ 'tstAsmStructsRC',    # 32-bit, may fail to start on 64-bit linux. Just ignore.