else:
raise "This program is expected to run with Python3 only"
-
-
##############
#
# Utilities
#py2
FileNotFoundError = OSError
+##############
+#
+# Cleanup on signal
+#
+#
+
+# Global variable. Stores which process group should be killed (or None otherwise)
+pgtokill = None
+
+def kill_process_group(pgid):
+ # print("Kill process group {}".format(pgid))
+ try:
+ os.killpg(pgid, signal.SIGTERM)
+ except OSError:
+ # os.killpg failed. OK. Some subprocesses may still be running.
+ pass
+
+def signal_handler(signal, frame):
+ print("Caught signal {}".format(SIGNALS_TO_NAMES_DICT[signal]))
+ if pgtokill is not None:
+ kill_process_group(pgtokill)
+ tesh_exit(5)
+
+
##############
#
args = shlex.split(self.args)
#print (args)
+ global pgtokill
+
try:
- proc = subprocess.Popen(args, bufsize=1, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True)
+ proc = subprocess.Popen(args, bufsize=1, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True, preexec_fn=os.setsid)
+ try:
+ pgtokill = os.getpgid(proc.pid)
+ except OSError:
+ # os.getpgid failed. OK. No cleanup.
+ pass
except FileNotFoundError:
print("["+FileReader().filename+":"+str(self.linenumber)+"] Cannot start '"+args[0]+"': File not found")
tesh_exit(3)
cmdName = FileReader().filename+":"+str(self.linenumber)
try:
(stdout_data, stderr_data) = proc.communicate("\n".join(self.input_pipe), self.timeout)
+ pgtokill = None
except subprocess.TimeoutExpired:
print("Test suite `"+FileReader().filename+"': NOK (<"+cmdName+"> timeout after "+str(self.timeout)+" sec)")
- proc.kill()
+ kill_process_group(pgtokill)
tesh_exit(3)
if self.output_display:
if __name__ == '__main__':
+ signal.signal(signal.SIGINT, signal_handler)
+ signal.signal(signal.SIGTERM, signal_handler)
parser = argparse.ArgumentParser(description='tesh -- testing shell', add_help=True)
group1 = parser.add_argument_group('Options')