IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2024-12-23 07:33:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

ipatests: Do not require group name resolution for the non-posix tests

Browse Source 
In the non-posix tests on the legacy clients, the testuser does not
belong to the testgroup (since this is represented by the NIS
group membership).

Relax the regular expression check for the output of the id testuser.

Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
This commit is contained in:
Tomas Babej 2014-02-06 16:08:04 +01:00 committed by Martin Kosek
parent 2e45002a2a
commit 11505d9bce
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ipatests/test_integration/test_legacy_clients.py
View File

@ -51,6 +51,9 @@ class BaseTestLegacyClient(object):
subdomain_testuser_uid_regex = None
subdomain_testuser_gid_regex = None
# To allow custom validation dependent on the trust type
posix_trust = False
@classmethod
def setup_class(cls):
super(BaseTestLegacyClient, cls).setup_class()
@ -152,9 +155,13 @@ class BaseTestLegacyClient(object):
result = self.legacy_client.run_command(['id', testuser])
# Only for POSIX trust testing does the testuser belong to the
# testgroup
group_name = '\(%s\)' % testgroup if self.posix_trust else ''
uid_regex = "uid=%s\(%s\)" % (self.testuser_uid_regex, testuser)
gid_regex = "gid=%s\(%s\)" % (self.testuser_gid_regex, testgroup)
groups_regex = "groups=%s\(%s\)" % (self.testuser_gid_regex, testgroup)
gid_regex = "gid=%s%s" % (self.testuser_gid_regex, group_name)
groups_regex = "groups=%s%s" % (self.testuser_gid_regex, group_name)
assert re.search(uid_regex, result.stdout_text)
assert re.search(gid_regex, result.stdout_text)
@ -274,9 +281,13 @@ class BaseTestLegacyClient(object):
result = self.legacy_client.run_command(['id', testuser])
# Only for POSIX trust testing does the testuser belong to the
# testgroup
group_name = '\(%s\)' % testgroup if self.posix_trust else ''
uid_regex = "uid=%s\(%s\)" % (self.testuser_uid_regex, testuser)
gid_regex = "gid=%s\(%s\)" % (self.testuser_gid_regex, testgroup)
groups_regex = "groups=%s\(%s\)" % (self.testuser_gid_regex, testgroup)
gid_regex = "gid=%s%s" % (self.testuser_gid_regex, group_name)
groups_regex = "groups=%s%s" % (self.testuser_gid_regex, group_name)
assert re.search(uid_regex, result.stdout_text)
assert re.search(gid_regex, result.stdout_text)
@ -395,6 +406,7 @@ class BaseTestLegacyClientPosix(BaseTestLegacyClient,
subdomain_testuser_uid_regex = '10142'
subdomain_testuser_gid_regex = '10147'
homedir_template = "/home/{username}"
posix_trust = True
def test_remove_trust_with_posix_attributes(self):
pass