From 81e6100713f269d060d1b0a24bcd632b1b420096 Mon Sep 17 00:00:00 2001 From: _Frky <3105926+Frky@users.noreply.github.com> Date: Fri, 31 Dec 2021 12:04:34 +0100 Subject: [PATCH 1/2] Fix terminaison of processes in python test script --- test/test_masscanned.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/test/test_masscanned.py b/test/test_masscanned.py index 54fee57..8c1c08b 100755 --- a/test/test_masscanned.py +++ b/test/test_masscanned.py @@ -193,16 +193,20 @@ except AssertionError: result = -1 # terminate masscanned -masscanned.kill() +masscanned.send_signal(2) +masscanned.terminate() masscanned.wait() # terminate capture if TCPDUMP: - tcpdump.kill() + tcpdump.send_signal(2) + tcpdump.terminate() tcpdump.wait() if ZEEK_PASSIVERECON: - zeek.kill() + zeek.send_signal(2) + zeek.terminate() zeek.wait() if P0F: - p0f.kill() + p0f.send_signal(2) + p0f.terminate() p0f.wait() sys.exit(result) From e85f527ca634b81a9dc69ac01ad9eaa9cf0e355c Mon Sep 17 00:00:00 2001 From: _Frky <3105926+Frky@users.noreply.github.com> Date: Fri, 31 Dec 2021 16:02:14 +0100 Subject: [PATCH 2/2] Use SIGINT and remove unecessary terminate --- test/test_masscanned.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/test/test_masscanned.py b/test/test_masscanned.py index 8c1c08b..044a295 100755 --- a/test/test_masscanned.py +++ b/test/test_masscanned.py @@ -20,6 +20,7 @@ import atexit import functools import logging import os +from signal import SIGINT import subprocess import sys from time import sleep @@ -193,20 +194,16 @@ except AssertionError: result = -1 # terminate masscanned -masscanned.send_signal(2) -masscanned.terminate() +masscanned.send_signal(SIGINT) masscanned.wait() # terminate capture if TCPDUMP: - tcpdump.send_signal(2) - tcpdump.terminate() + tcpdump.send_signal(SIGINT) tcpdump.wait() if ZEEK_PASSIVERECON: - zeek.send_signal(2) - zeek.terminate() + zeek.send_signal(SIGINT) zeek.wait() if P0F: - p0f.send_signal(2) - p0f.terminate() + p0f.send_signal(SIGINT) p0f.wait() sys.exit(result)