Skip to content

Commit

Permalink
DAOS-13886 test: Fix system name validation
Browse files Browse the repository at this point in the history
Fix regression on tests checking system name.

Features: control
Required-githooks: true
Signed-off-by: Cedric Koch-Hofer <cedric.koch-hofer@intel.com>
  • Loading branch information
kanard38 authored and knard-intel committed Jul 3, 2023
1 parent 03ef5e9 commit 9fc7233
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/tests/ftest/control/daos_agent_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ agent_config_val: !mux
config_val:
- "name"
- "! @#$%^&*()_+{}|:<>?-=[];',./"
- "PASS"
- "FAIL"
name_alphanumeric:
config_val:
- "name"
Expand Down
2 changes: 1 addition & 1 deletion src/tests/ftest/control/daos_control_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ control_config_val: !mux
config_val:
- "name"
- "! @#$%^&*()_+{}|:<>?-=[];',./"
- "PASS"
- "FAIL"
name_numeric:
config_val:
- "name"
Expand Down
4 changes: 4 additions & 0 deletions src/tests/ftest/control/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ def test_version(self):
if "dmg version" not in output:
errors.append("dmg version is not in the output! {}".format(output))

dmg_version = None
result = re.findall(r"dmg version ([\d.]+)", output)
if not result:
errors.append("Failed to obtain dmg version! {}".format(output))
Expand All @@ -63,6 +64,7 @@ def test_version(self):
if "daos version" not in output:
errors.append("daos version is not in the output! {}".format(output))

daos_version = None
result = re.findall(r"daos version ([\d.]+)", output)
if not result:
errors.append("Failed to obtain daos version! {}".format(output))
Expand All @@ -79,6 +81,7 @@ def test_version(self):
if "DAOS Agent" not in stdout:
errors.append("DAOS Agent is not in the output! {}".format(stdout))

daos_agent_version = None
result = re.findall(r"DAOS Agent v([\d.]+)", stdout)
if not result:
errors.append("Failed to obtain daos_agent version! {}".format(output))
Expand All @@ -95,6 +98,7 @@ def test_version(self):
if "DAOS Control Server" not in stdout:
errors.append("DAOS Control Server is not in the output! {}".format(stdout))

daos_server_version = None
result = re.findall(r"DAOS Control Server v([\d.]+)", stdout)
if not result:
errors.append("Failed to obtain daos_server version! {}".format(output))
Expand Down

0 comments on commit 9fc7233

Please sign in to comment.