From 8d55e3987fb3a03eadc1909e58f6ef4a06ec2ac2 Mon Sep 17 00:00:00 2001 From: Robert Baldyga Date: Fri, 2 Sep 2022 21:28:09 +0200 Subject: [PATCH] Update tests after cas_disk removal Signed-off-by: Robert Baldyga --- test/functional/api/cas/cas_module.py | 5 +---- test/functional/api/cas/installer.py | 2 +- test/functional/tests/misc/test_weak_modules.py | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/test/functional/api/cas/cas_module.py b/test/functional/api/cas/cas_module.py index dc46622..535e196 100644 --- a/test/functional/api/cas/cas_module.py +++ b/test/functional/api/cas/cas_module.py @@ -1,5 +1,5 @@ # -# Copyright(c) 2019-2021 Intel Corporation +# Copyright(c) 2019-2022 Intel Corporation # SPDX-License-Identifier: BSD-3-Clause # @@ -11,7 +11,6 @@ from test_utils.os_utils import ModuleRemoveMethod class CasModule(Enum): cache = "cas_cache" - disk = "cas_disk" def reload_all_cas_modules(): @@ -22,8 +21,6 @@ def reload_all_cas_modules(): def unload_all_cas_modules(): os_utils.unload_kernel_module(CasModule.cache.value, os_utils.ModuleRemoveMethod.rmmod) - os_utils.unload_kernel_module(CasModule.disk.value, - os_utils.ModuleRemoveMethod.rmmod) def is_cas_management_dev_present(): diff --git a/test/functional/api/cas/installer.py b/test/functional/api/cas/installer.py index b376bcd..a161a87 100644 --- a/test/functional/api/cas/installer.py +++ b/test/functional/api/cas/installer.py @@ -59,7 +59,7 @@ def install_opencas(destdir: str = ""): if output.exit_code != 0: raise CmdException("Failed to install Open CAS", output) - output = TestRun.executor.run("rmmod cas_cache cas_disk; modprobe cas_cache") + output = TestRun.executor.run("rmmod cas_cache; modprobe cas_cache") if output.exit_code != 0: raise CmdException("Failed to reload modules", output) diff --git a/test/functional/tests/misc/test_weak_modules.py b/test/functional/tests/misc/test_weak_modules.py index 30be2c2..2aadf7c 100644 --- a/test/functional/tests/misc/test_weak_modules.py +++ b/test/functional/tests/misc/test_weak_modules.py @@ -19,7 +19,7 @@ from test_tools.packaging import Packages modules_links_dir = "/lib/modules/$(uname -r)/weak-updates/block/opencas" -modules_names = ["cas_cache.ko", "cas_disk.ko"] +modules_names = ["cas_cache.ko"] def test_weak_modules():