From 40f831e67e1f312b1db52c74c119899245d03e32 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 24 Jul 2023 11:37:19 +1200 Subject: [PATCH] s4-torture/drs: Use addCleanup() in getchanges.py for OU handling BUG: https://bugzilla.samba.org/show_bug.cgi?id=15401 Signed-off-by: Andrew Bartlett Reviewed-by: Stefan Metzmacher --- source4/torture/drs/python/getncchanges.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/source4/torture/drs/python/getncchanges.py b/source4/torture/drs/python/getncchanges.py index 2095bc61a77..46598311f79 100644 --- a/source4/torture/drs/python/getncchanges.py +++ b/source4/torture/drs/python/getncchanges.py @@ -51,21 +51,13 @@ class DrsReplicaSyncIntegrityTestCase(drs_base.DrsBaseTestCase): self.ou = str(samba.tests.create_test_ou(self.test_ldb_dc, "getncchanges." + self.id().rsplit(".", 1)[1])) + self.addCleanup(self.ldb_dc2.delete, self.ou, ["tree_delete:1"]) + self.base_dn = self.test_ldb_dc.get_default_basedn() self.default_conn = DcConnection(self, self.ldb_dc2, self.dnsname_dc2) self.set_dc_connection(self.default_conn) - def tearDown(self): - super(DrsReplicaSyncIntegrityTestCase, self).tearDown() - # tidyup groups and users - try: - self.ldb_dc2.delete(self.ou, ["tree_delete:1"]) - except ldb.LdbError as e: - (enum, string) = e.args - if enum == ldb.ERR_NO_SUCH_OBJECT: - pass - def init_test_state(self): self.rxd_dn_list = [] self.rxd_links = [] -- 2.47.3