Merge pull request #1530 from Kamoppl/kamilg/fix_scope_bugs_v2

Kamilg/fix scope bugs v2
Open-CAS · Sep 24, 2024 · 3ad7c39 · 3ad7c39
2 parents 388e1ac + 6d71961
commit 3ad7c39
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/test/functional/api/cas/casadm.py b/test/functional/api/cas/casadm.py
@@ -516,5 +516,5 @@ def remove_all_detached_cores() -> None:
     from api.cas.casadm_parser import get_cas_devices_dict
 
     devices = get_cas_devices_dict()
-    for dev in devices["core_pool"]:
-        TestRun.executor.run(remove_detached_cmd(dev["device"]))
+    for dev in devices["core_pool"].values():
+        TestRun.executor.run(remove_detached_cmd(dev["device_path"]))
diff --git a/test/functional/api/cas/cli_help_messages.py b/test/functional/api/cas/cli_help_messages.py
@@ -274,11 +274,14 @@
     r"-o  --output-format \<FORMAT\>        Output format: \{table|csv\}",
 ]
 
-help_help = [r"Usage: casadm --help", r"Print help"]
+help_help = [
+    r"Usage: casadm --help",
+    r"Print help",
+]
 
 
 standby_help = [
-    r"The command is not supported"
+    r"The command is not supported",
 ]
 
 zero_metadata_help = [

diff --git a/test/functional/tests/cli/test_cli_help_and_version.py b/test/functional/tests/cli/test_cli_help_and_version.py
@@ -1,5 +1,6 @@
 #
 # Copyright(c) 2020-2022 Intel Corporation
+# Copyright(c) 2024 Huawei Technologies Co., Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
@@ -60,7 +61,7 @@ def test_cli_help(shortcut):
 
     output = TestRun.executor.run("casadm" + (" -L" if shortcut else " --list-caches")
                                   + (" -H" if shortcut else " --help"))
-    check_stdout_msg(output, list_help)
+    check_stdout_msg(output, list_caches_help)
 
     output = TestRun.executor.run("casadm" + (" -P" if shortcut else " --stats")
                                   + (" -H" if shortcut else " --help"))