From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Date: Fri, 17 Nov 2017 00:35:02 +0000 (-0500)
Subject: Use subprocess_terminate on Runtime close
X-Git-Url: http://git.efficios.com/?p=deliverable%2Flttng-ivc.git;a=commitdiff_plain;h=fbebf71be099d0ccc6d157377866be7bb8b28632

Use subprocess_terminate on Runtime close

Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
---

diff --git a/lttng_ivc/utils/runtime.py b/lttng_ivc/utils/runtime.py
index 264addc..4d367d3 100644
--- a/lttng_ivc/utils/runtime.py
+++ b/lttng_ivc/utils/runtime.py
@@ -267,13 +267,7 @@ class Runtime(object):
 
     def close(self):
         for key, subp in self.__subprocess.items():
-            subp.terminate()
-        for key, subp in self.__subprocess.items():
-            # TODO move timeout to settings
-            subp.wait(timeout=60)
-        for key, (stdout, stderr) in self.__stdout_stderr.items():
-            stdout.close()
-            stderr.close()
+            self.subprocess_terminate(key, check_return=False)
 
         # Always try to remove test module but do not perform check on return
         # value.