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

Merge pull request #1530 from Kamoppl/kamilg/fix_scope_bugs_v2

Browse Source 
Kamilg/fix scope bugs v2
This commit is contained in:
Robert Baldyga 2024-09-24 16:50:32 +02:00 committed by GitHub
commit 3ad7c39820
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/functional/api/cas/casadm.py
View File

@ -516,5 +516,5 @@ def remove_all_detached_cores() -> None:
from api.cas.casadm_parser import get_cas_devices_dict from api.cas.casadm_parser import get_cas_devices_dict
devices = get_cas_devices_dict() devices = get_cas_devices_dict()
for dev in devices["core_pool"]: for dev in devices["core_pool"].values():
TestRun.executor.run(remove_detached_cmd(dev["device"])) TestRun.executor.run(remove_detached_cmd(dev["device_path"]))

7
test/functional/api/cas/cli_help_messages.py
View File

@ -274,11 +274,14 @@ version_help = [
r"-o --output-format \<FORMAT\> Output format: \{table|csv\}", 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 = [ standby_help = [
r"The command is not supported" r"The command is not supported",
] ]
zero_metadata_help = [ zero_metadata_help = [

3
test/functional/tests/cli/test_cli_help_and_version.py
View File

@ -1,5 +1,6 @@
# #
# Copyright(c) 2020-2022 Intel Corporation # Copyright(c) 2020-2022 Intel Corporation
# Copyright(c) 2024 Huawei Technologies Co., Ltd.
# SPDX-License-Identifier: BSD-3-Clause # 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") output = TestRun.executor.run("casadm" + (" -L" if shortcut else " --list-caches")
+ (" -H" if shortcut else " --help")) + (" -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") output = TestRun.executor.run("casadm" + (" -P" if shortcut else " --stats")
+ (" -H" if shortcut else " --help")) + (" -H" if shortcut else " --help"))