Add Python 2/3 compat function to terminate a subprocess

Author: Flamefire

easybuild/tools/py2vs3/py2.py

@@ -33,6 +33,7 @@
 import ConfigParser as configparser  # noqa
 import json
 import subprocess
+import time
 import urllib2 as std_urllib  # noqa
 from collections import Mapping, OrderedDict  # noqa
 from HTMLParser import HTMLParser  # noqa
@@ -59,6 +60,23 @@ def subprocess_popen_text(cmd, **kwargs):
     return subprocess.Popen(cmd, stdout=subprocess.PIPE, **kwargs)
 
 
+def subprocess_terminate(proc, timeout):
+    """Terminate the subprocess if it hasn't finished after the given timeout"""
+    res = None
+    for pipe in (proc.stdout, proc.stderr, proc.stdin):
+        if pipe:
+            pipe.close()
+    while timeout > 0:
+        res = proc.poll()
+        if res is not None:
+            break
+        delay = min(timeout, 0.1)
+        time.sleep(delay)
+        timeout -= delay
+    if res is None:
+        proc.terminate()
+
+
 def raise_with_traceback(exception_class, message, traceback):
     """Raise exception of specified class with given message and traceback."""
     raise exception_class, message, traceback  # noqa: E999

easybuild/tools/py2vs3/py3.py

@@ -73,6 +73,17 @@ def subprocess_popen_text(cmd, **kwargs):
     return subprocess.Popen(cmd, stdout=subprocess.PIPE, universal_newlines=True, **kwargs)
 
 
+def subprocess_terminate(proc, timeout):
+    """Terminate the subprocess if it hasn't finished after the given timeout"""
+    try:
+        proc.communicate(timeout=timeout)
+    except subprocess.TimeoutExpired:
+        for pipe in (proc.stdout, proc.stderr, proc.stdin):
+            if pipe:
+                pipe.close()
+        proc.terminate()
+
+
 def raise_with_traceback(exception_class, message, traceback):
     """Raise exception of specified class with given message and traceback."""
     raise exception_class(message).with_traceback(traceback)

test/framework/asyncprocess.py

@@ -28,14 +28,14 @@
 @author: Toon Willems (Ghent University)
 """
 
-import subprocess
 import sys
 import time
 from test.framework.utilities import EnhancedTestCase
 from unittest import TextTestRunner, TestSuite
 
 import easybuild.tools.asyncprocess as p
 from easybuild.tools.asyncprocess import Popen
+from easybuild.tools.py2vs3 import subprocess_terminate
 
 
 class AsyncProcessTest(EnhancedTestCase):
@@ -63,11 +63,7 @@ def runTest(self):
 
     def tearDown(self):
         """cleanup"""
-        try:
-            # Terminate subprocess
-            self.shell.communicate(timeout=1)
-        except subprocess.TimeoutExpired:
-            pass
+        subprocess_terminate(self.shell, timeout=1)
         super(AsyncProcessTest, self).tearDown()
 
 

test/framework/run.py

@@ -51,6 +51,7 @@
 from easybuild.tools.run import check_async_cmd, check_log_for_errors, complete_cmd, get_output_from_process
 from easybuild.tools.run import parse_log_for_error, run_cmd, run_cmd_qa
 from easybuild.tools.config import ERROR, IGNORE, WARN
+from easybuild.tools.py2vs3 import subprocess_terminate
 
 
 class RunTest(EnhancedTestCase):
@@ -84,7 +85,7 @@ def get_proc(cmd, asynchronous=False):
                 yield proc
             finally:
                 # Make sure to close the process and its pipes
-                proc.communicate(timeout=1)
+                subprocess_terminate(proc, timeout=1)
 
         # get all output at once
         with get_proc("echo hello") as proc: