IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

test_legacy_clients: fix class inheritance

Browse Source 
Fixes: https://pagure.io/freeipa/issue/7940
Reviewed-By: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Rob Crittenden <rcritten@redhat.com>
This commit is contained in:
Alexander Bokovoy 2019-05-14 23:15:47 +03:00
parent c41b3ae98f
commit 245a8bcdfe
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ipatests/test_integration/test_legacy_clients.py
View File

@ -500,8 +500,8 @@ class BaseTestLegacyNssLdapRedHat:
# Base classes that join legacy client specific steps with steps required # Base classes that join legacy client specific steps with steps required
# to setup IPA with trust (both with and without using the POSIX attributes) # to setup IPA with trust (both with and without using the POSIX attributes)
class BaseTestLegacyClientPosix(BaseTestLegacyClient, class BaseTestLegacyClientPosix(trust_tests.BaseTestTrust,
trust_tests.TestEnforcedPosixADTrust): BaseTestLegacyClient):
testuser_uid_regex = '10042' testuser_uid_regex = '10042'
testuser_gid_regex = '10047' testuser_gid_regex = '10047'
@ -515,8 +515,8 @@ class BaseTestLegacyClientPosix(BaseTestLegacyClient,
pass pass
class BaseTestLegacyClientNonPosix(BaseTestLegacyClient, class BaseTestLegacyClientNonPosix(trust_tests.BaseTestTrust,
trust_tests.TestBasicADTrust): BaseTestLegacyClient):
testuser_uid_regex = r'(?!10042)(\d+)' testuser_uid_regex = r'(?!10042)(\d+)'
testuser_gid_regex = r'(?!10047)(\d+)' testuser_gid_regex = r'(?!10047)(\d+)'

7
ipatests/test_integration/test_trust.py
View File

@ -9,7 +9,7 @@ from ipatests.test_integration.base import IntegrationTest
from ipatests.pytest_ipa.integration import tasks from ipatests.pytest_ipa.integration import tasks
class TestTrust(IntegrationTest): class BaseTestTrust(IntegrationTest):
topology = 'line' topology = 'line'
num_ad_domains = 1 num_ad_domains = 1
num_ad_subdomains = 1 num_ad_subdomains = 1
@ -26,7 +26,7 @@ class TestTrust(IntegrationTest):
if not cls.master.transport.file_exists('/usr/bin/rpcclient'): if not cls.master.transport.file_exists('/usr/bin/rpcclient'):
raise unittest.SkipTest("Package samba-client not available " raise unittest.SkipTest("Package samba-client not available "
"on {}".format(cls.master.hostname)) "on {}".format(cls.master.hostname))
super(TestTrust, cls).install(mh) super(BaseTestTrust, cls).install(mh)
cls.ad = cls.ads[0] # pylint: disable=no-member cls.ad = cls.ads[0] # pylint: disable=no-member
cls.ad_domain = cls.ad.domain.name cls.ad_domain = cls.ad.domain.name
tasks.install_adtrust(cls.master) tasks.install_adtrust(cls.master)
@ -79,8 +79,9 @@ class TestTrust(IntegrationTest):
tasks.unconfigure_dns_for_trust(self.master, ad) tasks.unconfigure_dns_for_trust(self.master, ad)
tasks.clear_sssd_cache(self.master) tasks.clear_sssd_cache(self.master)
# Tests for non-posix AD trust
# Tests for non-posix AD trust
class TestTrust(BaseTestTrust):
def test_establish_nonposix_trust(self): def test_establish_nonposix_trust(self):
self.configure_dns_and_time(self.ad) self.configure_dns_and_time(self.ad)
tasks.establish_trust_with_ad( tasks.establish_trust_with_ad(