sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-21 18:04:06 +03:00
Code

pytest/samba_tool_drs_no_dns: use TestCaseInTempDir.rm_files/.rm_dirs

Browse Source 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15191
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15189

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Noel Power <npower@samba.org>
(cherry picked from commit 24f7d71416753b792d6fe029da6f366adb10383e)
This commit is contained in:
Douglas Bagnall 2022-06-15 13:23:32 +12:00 committed by Jule Anger
parent 42b5bfa68e
commit dd2c5f9698
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source4/torture/drs/python/samba_tool_drs_no_dns.py
View File

@ -24,7 +24,6 @@ Adapted from samba_tool_drs.py
"""
import samba.tests
import shutil
import os
import ldb
import drs_base
@ -47,16 +46,9 @@ class SambaToolDrsNoDnsTests(drs_base.DrsBaseTestCase):
def tearDown(self):
self._enable_inbound_repl(self.dnsname_dc1)
try:
shutil.rmtree(os.path.join(self.tempdir, "private"))
shutil.rmtree(os.path.join(self.tempdir, "etc"))
shutil.rmtree(os.path.join(self.tempdir, "msg.lock"))
os.remove(os.path.join(self.tempdir, "names.tdb"))
shutil.rmtree(os.path.join(self.tempdir, "state"))
shutil.rmtree(os.path.join(self.tempdir, "bind-dns"))
except Exception:
pass
self.rm_files('names.tdb', allow_missing=True)
self.rm_dirs('etc', 'msg.lock', 'private', 'state', 'bind-dns',
allow_missing=True)
super(SambaToolDrsNoDnsTests, self).tearDown()