From 245a8bcdfe32f665a0a1902e54d49e4ba2cd4ce4 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Tue, 14 May 2019 23:15:47 +0300 Subject: [PATCH] test_legacy_clients: fix class inheritance Fixes: https://pagure.io/freeipa/issue/7940 Reviewed-By: Christian Heimes Reviewed-By: Rob Crittenden --- ipatests/test_integration/test_legacy_clients.py | 8 ++++---- ipatests/test_integration/test_trust.py | 7 ++++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ipatests/test_integration/test_legacy_clients.py b/ipatests/test_integration/test_legacy_clients.py index 1bc2797f9..38932f1f6 100644 --- a/ipatests/test_integration/test_legacy_clients.py +++ b/ipatests/test_integration/test_legacy_clients.py @@ -500,8 +500,8 @@ class BaseTestLegacyNssLdapRedHat: # Base classes that join legacy client specific steps with steps required # to setup IPA with trust (both with and without using the POSIX attributes) -class BaseTestLegacyClientPosix(BaseTestLegacyClient, - trust_tests.TestEnforcedPosixADTrust): +class BaseTestLegacyClientPosix(trust_tests.BaseTestTrust, + BaseTestLegacyClient): testuser_uid_regex = '10042' testuser_gid_regex = '10047' @@ -515,8 +515,8 @@ class BaseTestLegacyClientPosix(BaseTestLegacyClient, pass -class BaseTestLegacyClientNonPosix(BaseTestLegacyClient, - trust_tests.TestBasicADTrust): +class BaseTestLegacyClientNonPosix(trust_tests.BaseTestTrust, + BaseTestLegacyClient): testuser_uid_regex = r'(?!10042)(\d+)' testuser_gid_regex = r'(?!10047)(\d+)' diff --git a/ipatests/test_integration/test_trust.py b/ipatests/test_integration/test_trust.py index ed4c25e04..71ce9d83d 100644 --- a/ipatests/test_integration/test_trust.py +++ b/ipatests/test_integration/test_trust.py @@ -9,7 +9,7 @@ from ipatests.test_integration.base import IntegrationTest from ipatests.pytest_ipa.integration import tasks -class TestTrust(IntegrationTest): +class BaseTestTrust(IntegrationTest): topology = 'line' num_ad_domains = 1 num_ad_subdomains = 1 @@ -26,7 +26,7 @@ class TestTrust(IntegrationTest): if not cls.master.transport.file_exists('/usr/bin/rpcclient'): raise unittest.SkipTest("Package samba-client not available " "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_domain = cls.ad.domain.name tasks.install_adtrust(cls.master) @@ -79,8 +79,9 @@ class TestTrust(IntegrationTest): tasks.unconfigure_dns_for_trust(self.master, ad) 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): self.configure_dns_and_time(self.ad) tasks.establish_trust_with_ad(