diff options
| author | Tomas Babej <tbabej@redhat.com> | 2014-02-05 14:56:19 +0100 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2014-02-11 16:37:44 +0100 |
| commit | 2e45002a2a320cdc797b5a475e6ef5a60a247bff (patch) | |
| tree | 88a6eb2c3469cbe60da18f2fd12b09dcc83697fc /ipatests/test_integration/test_trust.py | |
| parent | ba7d404912409152f1df128d9f9b3e0148e2cc8d (diff) | |
| download | freeipa.git-2e45002a2a320cdc797b5a475e6ef5a60a247bff.tar.gz freeipa.git-2e45002a2a320cdc797b5a475e6ef5a60a247bff.tar.xz freeipa.git-2e45002a2a320cdc797b5a475e6ef5a60a247bff.zip | |
ipatests: Change expected home directories returned by getent
The hardcoded values for the home directories for the AD users did
not properly scale up from the POSIX attrs only test scanario.
When using POSIX attrs, the home dir is returned as whatever is set
in the AD (/home/username by default). Without using POSIX attributes,
the /home/domain/username form is taken by default.
Refactor the tests to take this behaviour into account.
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
Diffstat (limited to 'ipatests/test_integration/test_trust.py')
| -rw-r--r-- | ipatests/test_integration/test_trust.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ipatests/test_integration/test_trust.py b/ipatests/test_integration/test_trust.py index 68fc0285..ec545bab 100644 --- a/ipatests/test_integration/test_trust.py +++ b/ipatests/test_integration/test_trust.py @@ -93,8 +93,9 @@ class TestBasicADTrust(ADTrustBase): # This regex checks that Test User does not have UID 10042 nor belongs # to the group with GID 10047 testuser_regex = "^testuser@%s:\*:(?!10042)(\d+):(?!10047)(\d+):"\ - "Test User:/home/testuser:/bin/sh$"\ - % re.escape(self.ad.domain.name) + "Test User:/home/%s/testuser:/bin/sh$"\ + % (re.escape(self.ad.domain.name), + re.escape(self.ad.domain.name)) assert re.search(testuser_regex, result.stdout_text) |