diff options
| author | Lenka Doudova <ldoudova@redhat.com> | 2016-08-31 16:57:12 +0200 |
|---|---|---|
| committer | Martin Babinsky <mbabinsk@redhat.com> | 2016-09-09 16:54:05 +0200 |
| commit | fc5a99274c2ea0301a539fe9a8b2dc9b61786a8a (patch) | |
| tree | 8f96c058b9ee15e1ae27e3b54e00d881bbe90fa6 /ipatests | |
| parent | 003b364c5a06a5adc89bac7371f46d534cfb4616 (diff) | |
Tests: Fix regex errors in integration trust tests
In integration trust tests some values are checked using regular expressions.
Some of these expressions from recently added coverage have minor mistakes
which causes the comparisons to fail. Providing fix for these regular
expressions.
https://fedorahosted.org/freeipa/ticket/6285
Reviewed-By: Martin Babinsky <mbabinsk@redhat.com>
Diffstat (limited to 'ipatests')
| -rw-r--r-- | ipatests/test_integration/test_trust.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ipatests/test_integration/test_trust.py b/ipatests/test_integration/test_trust.py index d0b8e58b7..69418dc8f 100644 --- a/ipatests/test_integration/test_trust.py +++ b/ipatests/test_integration/test_trust.py @@ -298,8 +298,8 @@ class TestExternalTrustWithSubdomain(ADTrustSubdomainBase): testuser = 'subdomaintestuser@{0}'.format(self.ad_subdomain) result = self.master.run_command(['getent', 'passwd', testuser]) - testuser_regex = ("^subdomaintestuser@{0}:\*:(?!10042)(\d+):" - "(?!)10047(\d+):Subdomain TestUser:" + testuser_regex = ("^subdomaintestuser@{0}:\*:(?!10142)(\d+):" + "(?!10147)(\d+):Subdomaintest User:" "/home/{1}/subdomaintestuser:/bin/sh$".format( re.escape(self.ad_subdomain), re.escape(self.ad_subdomain))) @@ -393,8 +393,9 @@ class TestTrustWithUPN(ADTrustBase): self.upn_principal]) # result will contain AD domain, not UPN - upnuser_regex = "^{}@{}:\*:(\d+):(\d+):{}:/:$".format( - self.upn_username, self.ad_domain, self.upn_name) + upnuser_regex = "^{}@{}:\*:(\d+):(\d+):{}:/home/{}/{}:/bin/sh$".format( + self.upn_username, self.ad_domain, self.upn_name, + self.ad_domain, self.upn_username) assert re.search(upnuser_regex, result.stdout_text) def test_upn_user_authentication(self): |