From 6ac153e1acfaef1fcfb84815e4d5de81c1a24614 Mon Sep 17 00:00:00 2001 From: Kamil Gierszewski Date: Wed, 29 Jun 2022 17:14:32 +0200 Subject: [PATCH] tests: Fix DRBD cleanup Signed-off-by: Kamil Gierszewski --- test/functional/tests/conftest.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/test/functional/tests/conftest.py b/test/functional/tests/conftest.py index ff7b3aa..f8dca8b 100644 --- a/test/functional/tests/conftest.py +++ b/test/functional/tests/conftest.py @@ -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: