sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-20 22:50:26 +03:00
Code

tests/krb5/kdc_base_test.py: Defer account deletion until tearDownClass() is called

Browse Source 
This allows accounts created for permutation tests to be reused, rather
than having to be recreated for every test.

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14817
(cherry picked from commit 5412bffb9b4fc13023e650bbc9436a79b60b6fa2)
This commit is contained in:
Joseph Sutton 2021-06-15 15:38:28 +12:00 committed by Jule Anger
parent af9e564cac
commit 461131ed51
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
python/samba/tests/krb5/kdc_base_test.py
View File

@ -99,21 +99,27 @@ class KDCBaseTest(RawKerberosTest):
base="", expression="", scope=SCOPE_BASE, attrs=["dnsHostName"])
cls.dns_host_name = str(res[0]['dnsHostName'])
# A set containing DNs of accounts created as part of testing.
cls.accounts = set()
@classmethod
def tearDownClass(cls):
# Clean up any accounts created by create_account. This is
# done in tearDownClass() rather than tearDown(), so that
# accounts need only be created once for permutation tests.
for dn in cls.accounts:
delete_force(cls.ldb, dn)
super().tearDownClass()
def setUp(self):
super().setUp()
self.do_asn1_print = global_asn1_print
self.do_hexdump = global_hexdump
self.accounts = []
def tearDown(self):
# Clean up any accounts created by create_account
for dn in self.accounts:
delete_force(self.ldb, dn)
def create_account(self, name, machine_account=False, spn=None, upn=None):
'''Create an account for testing.
The dn of the created account is added to self.accounts,
which is used by tearDown to clean up the created accounts.
which is used by tearDownClass to clean up the created accounts.
'''
dn = "cn=%s,%s" % (name, self.ldb.domain_dn())
@ -153,8 +159,8 @@ class KDCBaseTest(RawKerberosTest):
if machine_account:
creds.set_workstation(name)
#
# Save the account name so it can be deleted in the tearDown
self.accounts.append(dn)
# Save the account name so it can be deleted in tearDownClass
self.accounts.add(dn)
return (creds, dn)