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

Merge pull request #1256 from Kgierszx/Fix_DRBD_cleanup

Browse Source 
tests: Fix DRBD cleanup
This commit is contained in:
Robert Baldyga
2022-07-01 23:04:39 +02:00
committed by GitHub
parent ed9bacf0b5 6ac153e1ac
commit f97d8f3eff
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -136,6 +136,12 @@ def pytest_runtest_teardown():
kill_all_io()
unmount_cas_devices()
if installer.check_if_installed():
casadm.remove_all_detached_cores()
casadm.stop_all_caches()
from api.cas.init_config import InitConfig
InitConfig.create_default_init_config()
from storage_devices.drbd import Drbd
if installer.check_if_installed() and Drbd.is_installed():
try:
@@ -145,11 +151,6 @@ def pytest_runtest_teardown():
elif Drbd.is_installed():
Drbd.down_all()
if installer.check_if_installed():
casadm.remove_all_detached_cores()
casadm.stop_all_caches()
from api.cas.init_config import InitConfig
InitConfig.create_default_init_config()
DeviceMapper.remove_all()
RamDisk.remove_all()
except Exception as ex: