From ea7b8d66536e388152619c99f8cc83e3fd7e92b8 Mon Sep 17 00:00:00 2001 From: Anuja More Date: Thu, 25 Jun 2020 12:15:13 +0530 Subject: [PATCH] ipatests: cleanup in test_subdomain_lookup_with_certmaprule_containing_dn As tests was failing <= fedora31 Thus removed certmap-rule in cleanup as subdomain lookup fails when certmaprule contains DN. Related: https://pagure.io/SSSD/sssd/issue/3721 Signed-off-by: Anuja More Reviewed-By: Kaleemullah Siddiqui Reviewed-By: Armando Neto Reviewed-By: Florence Blanc-Renaud --- ipatests/test_integration/test_sssd.py | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/ipatests/test_integration/test_sssd.py b/ipatests/test_integration/test_sssd.py index cfbb30fec..5391433e3 100644 --- a/ipatests/test_integration/test_sssd.py +++ b/ipatests/test_integration/test_sssd.py @@ -471,15 +471,19 @@ class TestSSSDWithAdTrust(IntegrationTest): "--matchrule='{}'".format(cert_subject), "--domain={}".format(self.master.domain.name) ]) - tasks.clear_sssd_cache(self.master) - - # verify the user can be retrieved after the certmaprule is added - second_res = self.master.run_command(['id', self.users['ad']['name']]) - - assert first_res.stdout_text == second_res.stdout_text - verify_in_stdout = ['gid', 'uid', 'groups', self.users['ad']['name']] - for text in verify_in_stdout: - assert text in second_res.stdout_text + try: + tasks.clear_sssd_cache(self.master) + # verify the user can be retrieved after the certmaprule is added + second_res = self.master.run_command( + ['id', self.users['ad']['name']]) + assert first_res.stdout_text == second_res.stdout_text + verify_in_stdout = ['gid', 'uid', 'groups', + self.users['ad']['name']] + for text in verify_in_stdout: + assert text in second_res.stdout_text + finally: + self.master.run_command( + ['ipa', 'certmaprule-del', "'{}'".format(cert_subject)]) @contextmanager def override_gid_setup(self, gid):