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

Jump to bottom

[Backport][ipa-4-11] ipatests: fix expected output for ipahealthcheck.meta.services #7075

Closed
wants to merge 1 commit into from
Closed

[Backport][ipa-4-11] ipatests: fix expected output for ipahealthcheck.meta.services #7075

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
7 changes: 6 additions & 1 deletion ipatests/test_integration/test_ipahealthcheck.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,6 +454,11 @@ def test_source_ipahealthcheck_meta_services_check(self, restart_service):
assert data[0]["result"] == "SUCCESS"
assert data[0]["kw"]["status"] is True

version = tasks.get_healthcheck_version(self.master)
# With healthcheck newer versions, the error msg for PKI tomcat
# contains the string pki-tomcatd instead of pki_tomcatd
always_replace = parse_version(version) >= parse_version("0.13")

for service in svc_list:
restart_service(self.master, service)
returncode, data = run_healthcheck(
Expand All @@ -466,7 +471,7 @@ def test_source_ipahealthcheck_meta_services_check(self, restart_service):
for check in data:
if check["check"] != service:
continue
if service != 'pki_tomcatd':
if service != 'pki_tomcatd' or always_replace:
service = service.replace('_', '-')
assert check["result"] == "ERROR"
assert check["kw"]["msg"] == "%s: not running" % service
Expand Down
Loading