pytest/samba_tool_drs: use TestCaseInTempDir.rm_files/.rm_dirs

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Noel Power <npower@samba.org>

diff --git a/source4/torture/drs/python/samba_tool_drs.py b/source4/torture/drs/python/samba_tool_drs.py
index ac97162e23d0b6a69aac201636d92fc471a0f790..8538c3041a45756376325e437fdd8bb19a5db30b 100644 (file)
--- a/source4/torture/drs/python/samba_tool_drs.py
+++ b/source4/torture/drs/python/samba_tool_drs.py
@@ -19,7 +19,6 @@
 """Blackbox tests for samba-tool drs."""
 
 import samba.tests
-import shutil
 import os
 import ldb
 import drs_base
@@ -42,15 +41,9 @@ class SambaToolDrsTests(drs_base.DrsBaseTestCase):
         self._enable_inbound_repl(self.dnsname_dc1)
         self._enable_inbound_repl(self.dnsname_dc2)
 
-        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(SambaToolDrsTests, self).tearDown()