From f74ab3cba2b02e4726519e602f7de4fc86fca2d1 Mon Sep 17 00:00:00 2001 From: Tomas Babej Date: Tue, 8 Apr 2014 08:31:58 +0200 Subject: 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 --- ipatests/test_integration/test_legacy_clients.py | 12 ++++++++---- 1 file 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) -- cgit