IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

ipatests: fix expected output for ipahealthcheck.ipa.files

Browse Source 
With ipa-healthcheck 0.8, the test ipahealthcheck.ipa.files is able
to return a list of possible owners/groups as a comma-separated string
instead of a single owner/group (see commit 930ec5f).

The test output needs to be fixed accordingly.

Fixes: https://pagure.io/freeipa/issue/8662

Signed-off-by: Florence Blanc-Renaud <flo@redhat.com>
Reviewed-By: Rob Crittenden <rcritten@redhat.com>
This commit is contained in:
Florence Blanc-Renaud 2021-01-18 10:04:58 +01:00 committed by Rob Crittenden
parent 54e5ffc000
commit 0801d4c058
1 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
ipatests/test_integration/test_ipahealthcheck.py
View File

@ -1625,6 +1625,19 @@ class TestIpaHealthCheckFileCheck(IntegrationTest):
version = tasks.get_healthcheck_version(self.master) version = tasks.get_healthcheck_version(self.master)
if parse_version(version) < parse_version("0.6"): if parse_version(version) < parse_version("0.6"):
pytest.skip("Skipping test for 0.4 healthcheck version") pytest.skip("Skipping test for 0.4 healthcheck version")
# ipa-healthcheck 0.8 returns a list of possible owners instead
# of a single value
if parse_version(version) >= parse_version("0.8"):
expected_owner = 'root,systemd-resolve'
expected_msg = ("Ownership of %s is admin "
"and should be one of root,systemd-resolve"
% paths.RESOLV_CONF)
else:
expected_owner = 'root'
expected_msg = ("Ownership of %s is admin and should be root"
% paths.RESOLV_CONF)
modify_permissions(self.master, path=paths.RESOLV_CONF, owner="admin") modify_permissions(self.master, path=paths.RESOLV_CONF, owner="admin")
returncode, data = run_healthcheck( returncode, data = run_healthcheck(
self.master, self.master,
@ -1637,18 +1650,27 @@ class TestIpaHealthCheckFileCheck(IntegrationTest):
assert check["result"] == "WARNING" assert check["result"] == "WARNING"
assert check["kw"]["key"] == '_etc_resolv.conf_owner' assert check["kw"]["key"] == '_etc_resolv.conf_owner'
assert check["kw"]["type"] == 'owner' assert check["kw"]["type"] == 'owner'
assert check["kw"]["expected"] == 'root' assert check["kw"]["expected"] == expected_owner
assert check["kw"]["got"] == 'admin' assert check["kw"]["got"] == 'admin'
assert ( assert check["kw"]["msg"] == expected_msg
check["kw"]["msg"]
== "Ownership of %s is admin and should be root"
% paths.RESOLV_CONF
)
def test_ipa_filecheck_bad_group(self, modify_permissions): def test_ipa_filecheck_bad_group(self, modify_permissions):
version = tasks.get_healthcheck_version(self.master) version = tasks.get_healthcheck_version(self.master)
if parse_version(version) < parse_version("0.6"): if parse_version(version) < parse_version("0.6"):
pytest.skip("Skipping test for 0.4 healthcheck version") pytest.skip("Skipping test for 0.4 healthcheck version")
# ipa-healthcheck 0.8 returns a list of possible groups instead
# of a single value
if parse_version(version) >= parse_version("0.8"):
expected_group = 'root,systemd-resolve'
expected_msg = ("Group of %s is admins and should be one of "
"root,systemd-resolve"
% paths.RESOLV_CONF)
else:
expected_group = 'root'
expected_msg = ("Group of %s is admins and should be root"
% paths.RESOLV_CONF)
modify_permissions(self.master, path=paths.RESOLV_CONF, group="admins") modify_permissions(self.master, path=paths.RESOLV_CONF, group="admins")
returncode, data = run_healthcheck( returncode, data = run_healthcheck(
self.master, self.master,
@ -1661,13 +1683,9 @@ class TestIpaHealthCheckFileCheck(IntegrationTest):
assert check["result"] == "WARNING" assert check["result"] == "WARNING"
assert check["kw"]["key"] == '_etc_resolv.conf_group' assert check["kw"]["key"] == '_etc_resolv.conf_group'
assert check["kw"]["type"] == 'group' assert check["kw"]["type"] == 'group'
assert check["kw"]["expected"] == 'root' assert check["kw"]["expected"] == expected_group
assert check["kw"]["got"] == 'admins' assert check["kw"]["got"] == 'admins'
assert ( assert check["kw"]["msg"] == expected_msg
check["kw"]["msg"]
== "Group of %s is admins and should be root"
% paths.RESOLV_CONF
)
def test_ipa_filecheck_bad_too_restrictive(self, modify_permissions): def test_ipa_filecheck_bad_too_restrictive(self, modify_permissions):
version = tasks.get_healthcheck_version(self.master) version = tasks.get_healthcheck_version(self.master)