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 b13bcabbac9e1bd2178e67ddd790c312620132ca..2df30a641bfa2db9d8006daee687ff032dcf9176 100644 (file)
--- 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():