Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test: test_check_cluster_configuration: relax required resource options #294

Merged
merged 1 commit into from
Dec 16, 2024
Merged

Test: test_check_cluster_configuration: relax required resource options #294

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 14 additions & 15 deletions e2e_test/hawk_test_driver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -779,17 +779,16 @@ def test_check_cluster_configuration(self, ssh):
print(f"ERROR: Couldn't find element temp_crm_config[rsc_defaults]")
return False
lst = elem.text.split('\n')
if not lst:
print(f'ERROR: temp_crm_config[rsc_defaults] is empty')
return False
for a in ['migration-threshold']:
if a not in lst:
lst.append(a)
lst.sort()
lst2 = LongLiterals.RSC_DEFAULT_ATTRIBUTES.split('\n')
lst2.sort()
if lst != lst2:
print(f"ERROR: temp_crm_config[rsc_defaults] has WRONG values.")
print(f" Expected: {lst}")
print(f" Exist: {lst2}")
return False
for a in lst:
if a not in LongLiterals.RSC_DEFAULT_ATTRIBUTES.split('\n'):
print(f'ERROR: temp_crm_config[rsc_defaults] has the WRONG option: {a}')
return False

elem = self.find_element(By.NAME, 'temp_crm_config[op_defaults]')
if not elem:
Expand Down Expand Up @@ -849,7 +848,7 @@ def test_check_cluster_configuration(self, ssh):
time.sleep(1)

# ["<resource name>", ["<option1>", "<option2>,..."]]
for check_options in [ ["no-quorum-policy", ["stop", "freeze", "ignore", "demote", "suicide"]],
for check_options in [ ["no-quorum-policy", ["stop", "fence", "freeze", "ignore", "demote", "suicide"]],
["stonith-action", ["reboot", "off", "poweroff"]],
["node-health-strategy", ["none", "migrate-on-red", "only-green", "progressive", "custom"]],
["placement-strategy", ["default", "utilization", "minimal", "balanced"]]]:
Expand All @@ -859,13 +858,13 @@ def test_check_cluster_configuration(self, ssh):
return False

lst = elem.text.split('\n')
lst.sort()
check_options[1].sort()
if lst != check_options[1]:
print(f'ERROR: {check_options[0]} has WRONG options.')
print(f" Expected: {lst}")
print(f" Exist: {check_options[1]}")
if not lst:
print(f'ERROR: crm_config[crm_config][{check_options[0]}] is empty')
return False
for a in lst:
if a not in check_options[1]:
print(f'ERROR: crm_config[crm_config][{check_options[0]}] has the WRONG option: {a}')
return False
print(f"INFO: Resource options are correct")

time.sleep(self.timeout_scale)
Expand Down
Loading