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

Merge pull request #246 from katlapinka/prepare-fix

Browse Source 
Small prepare fixes: remove dm devices and move setting default init config
This commit is contained in:
Michal Rakowski 2019-12-19 12:50:49 +01:00 committed by GitHub
commit b755bb9121
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -183,9 +183,12 @@ def base_prepare(item):
with TestRun.LOGGER.step("Cleanup before test"): with TestRun.LOGGER.step("Cleanup before test"):
Udev.enable() Udev.enable()
kill_all_io() kill_all_io()
DeviceMapper.remove_all()
if installer.check_if_installed(): if installer.check_if_installed():
try: try:
from api.cas import init_config
init_config.create_default_init_config()
unmount_cas_devices() unmount_cas_devices()
casadm.stop_all_caches() casadm.stop_all_caches()
casadm.remove_all_detached_cores() casadm.remove_all_detached_cores()
@ -202,8 +205,6 @@ def base_prepare(item):
elif not installer.check_if_installed(): elif not installer.check_if_installed():
installer.install_opencas() installer.install_opencas()
TestRun.plugins['opencas'].already_updated = True TestRun.plugins['opencas'].already_updated = True
from api.cas import init_config
init_config.create_default_init_config()
TestRun.LOGGER.add_build_info(f'Commit hash:') TestRun.LOGGER.add_build_info(f'Commit hash:')
TestRun.LOGGER.add_build_info(f"{git.get_current_commit_hash()}") TestRun.LOGGER.add_build_info(f"{git.get_current_commit_hash()}")
TestRun.LOGGER.add_build_info(f'Commit message:') TestRun.LOGGER.add_build_info(f'Commit message:')