From 923015ed1ef40f250631ce97cb3ab6c43b016b34 Mon Sep 17 00:00:00 2001 From: Rafal Stefanowski Date: Tue, 26 Nov 2019 16:39:18 +0100 Subject: [PATCH] Improve handling of process killing Signed-off-by: Rafal Stefanowski --- test/functional/test-framework | 2 +- test/functional/tests/conftest.py | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/test/functional/test-framework b/test/functional/test-framework index a2f3d66..c58510d 160000 --- a/test/functional/test-framework +++ b/test/functional/test-framework @@ -1 +1 @@ -Subproject commit a2f3d6631e6c21cdea238bc2a53851655d498ff8 +Subproject commit c58510d62691ec0984dbbbf151f1bba86c65cff4 diff --git a/test/functional/tests/conftest.py b/test/functional/tests/conftest.py index a32f52b..aad034e 100644 --- a/test/functional/tests/conftest.py +++ b/test/functional/tests/conftest.py @@ -16,7 +16,7 @@ from core.test_run_utils import TestRun from api.cas import installer from api.cas import casadm from api.cas import git -from test_utils.os_utils import Udev +from test_utils.os_utils import Udev, kill_all_io from test_tools.disk_utils import PartitionTable, create_partition_table from log.logger import create_log, Log from test_utils.singleton import Singleton @@ -178,12 +178,6 @@ def unmount_cas_devices(): ) -def kill_all_io(): - TestRun.executor.run("pkill --signal SIGKILL dd") - TestRun.executor.run("kill -9 `ps aux | grep -i vdbench.* | awk '{ print $1 }'`") - TestRun.executor.run("pkill --signal SIGKILL fio*") - - def get_force_param(item): return item.config.getoption("--force-reinstall") is not "False"