From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 26 Oct 2012 23:58:06 +0000 (-0800)
Subject: TestCaseInTempDir: Use addCleanup rather than tearDown.
X-Git-Tag: ldb-1.1.14~126
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8d397b69bb29b7a464b610bc46cedd6be01b2455;p=thirdparty%2Fsamba.git

TestCaseInTempDir: Use addCleanup rather than tearDown.
---

diff --git a/source4/scripting/python/samba/tests/__init__.py b/source4/scripting/python/samba/tests/__init__.py
index b13bcabbac9..2df30a641bf 100644
--- a/source4/scripting/python/samba/tests/__init__.py
+++ b/source4/scripting/python/samba/tests/__init__.py
@@ -76,11 +76,12 @@ class TestCaseInTempDir(TestCase):
     def setUp(self):
         super(TestCaseInTempDir, self).setUp()
         self.tempdir = tempfile.mkdtemp()
+        self.addCleanup(self._remove_tempdir)
 
-    def tearDown(self):
-        super(TestCaseInTempDir, self).tearDown()
+    def _remove_tempdir(self):
         self.assertEquals([], os.listdir(self.tempdir))
         os.rmdir(self.tempdir)
+        self.tempdir = None
 
 
 def env_loadparm():