summaryrefslogtreecommitdiffstats
path: root/ipatests
diff options
context:
space:
mode:
authorTomas Babej <tbabej@redhat.com>2014-04-08 08:31:58 +0200
committerPetr Viktorin <pviktori@redhat.com>2014-04-17 16:31:11 +0200
commitf74ab3cba2b02e4726519e602f7de4fc86fca2d1 (patch)
tree616afba70f97de8722d85cdd0f5090253fdf6fb2 /ipatests
parent49a59d129207f5bc090b45afde2d607980467b29 (diff)
downloadfreeipa-f74ab3cba2b02e4726519e602f7de4fc86fca2d1.tar.gz
freeipa-f74ab3cba2b02e4726519e602f7de4fc86fca2d1.tar.xz
freeipa-f74ab3cba2b02e4726519e602f7de4fc86fca2d1.zip
ipatests: Fix incorrect UID/GID reference for subdomain users and groups
In legacy client integration test, the test cases that query information from subdomain about subdomain users and group expected subdomain users and groups to have the UIDs/GIDs as users and groups in the root domain. Reviewed-By: Petr Viktorin <pviktori@redhat.com>
Diffstat (limited to 'ipatests')
-rw-r--r--ipatests/test_integration/test_legacy_clients.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/ipatests/test_integration/test_legacy_clients.py b/ipatests/test_integration/test_legacy_clients.py
index af4202de6..4e8b52e6b 100644
--- a/ipatests/test_integration/test_legacy_clients.py
+++ b/ipatests/test_integration/test_legacy_clients.py
@@ -268,7 +268,8 @@ class BaseTestLegacyClient(object):
testgroup = 'subdomaintestgroup@%s' % self.ad_subdomain
result = self.legacy_client.run_command(['getent', 'group', testgroup])
- testgroup_stdout = "%s:\*:%s:" % (testgroup, self.testuser_gid_regex)
+ testgroup_stdout = "%s:\*:%s:" % (testgroup,
+ self.subdomain_testuser_gid_regex)
assert re.search(testgroup_stdout, result.stdout_text)
def test_id_subdomain_ad_user(self):
@@ -285,9 +286,12 @@ class BaseTestLegacyClient(object):
# 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, group_name)
- groups_regex = "groups=%s%s" % (self.testuser_gid_regex, group_name)
+ uid_regex = "uid=%s\(%s\)" % (self.subdomain_testuser_uid_regex,
+ testuser)
+ gid_regex = "gid=%s%s" % (self.subdomain_testuser_gid_regex,
+ group_name)
+ groups_regex = "groups=%s%s" % (self.subdomain_testuser_gid_regex,
+ group_name)
assert re.search(uid_regex, result.stdout_text)
assert re.search(gid_regex, result.stdout_text)