github/open-cas-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #198 from rafalste/improve_process_killing

Browse Source 
Improve handling of process killing ('open-cas-linux' + 'test-framework' changes)
This commit is contained in:
Robert Baldyga 2019-11-28 16:57:41 +01:00 committed by GitHub
commit 18c77daec9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/functional/test-framework

@ -1 +1 @@
Subproject commit a2f3d6631e6c21cdea238bc2a53851655d498ff8 Subproject commit c58510d62691ec0984dbbbf151f1bba86c65cff4

8
test/functional/tests/conftest.py
View File

@ -16,7 +16,7 @@ from core.test_run_utils import TestRun
from api.cas import installer from api.cas import installer
from api.cas import casadm from api.cas import casadm
from api.cas import git 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 test_tools.disk_utils import PartitionTable, create_partition_table
from log.logger import create_log, Log from log.logger import create_log, Log
from test_utils.singleton import Singleton 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): def get_force_param(item):
return item.config.getoption("--force-reinstall") is not "False" return item.config.getoption("--force-reinstall") is not "False"