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

Merge pull request #505 from Ostrokrzew/fix

Browse Source 
Few fixes after recent changes
This commit is contained in:
Robert Baldyga
2020-08-26 10:59:53 +02:00
committed by GitHub
parent e8fa4ca7fc 77db7de4bc
commit ecebb52b46
3 changed files with 2 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -81,10 +81,6 @@ def test_cli_help(shortcut):
+ (" -H" if shortcut else " --help"))
check_stdout_msg(output, ioclass_help)
output = TestRun.executor.run("casadm" + (" -N" if shortcut else " --nvme")
+ (" -H" if shortcut else " --help"))
check_stdout_msg(output, nvme_help)
output = TestRun.executor.run("casadm" + (" -V" if shortcut else " --version")
+ (" -H" if shortcut else " --help"))
check_stdout_msg(output, version_help)
@@ -126,5 +122,5 @@ def names_in_output(output):
def versions_in_output(output):
version_pattern = re.compile(r"(\d){2}\.(\d){2}\.(\d){2}\.(\d){8}")
version_pattern = re.compile(r"(\d){2}\.(\d){2}\.(\d)\.(\d){4}.(\S)")
return len(version_pattern.findall(output)) == 3