From fbebf71be099d0ccc6d157377866be7bb8b28632 Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Thu, 16 Nov 2017 19:35:02 -0500 Subject: [PATCH] Use subprocess_terminate on Runtime close Signed-off-by: Jonathan Rajotte --- lttng_ivc/utils/runtime.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) 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. -- 2.34.1