summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--python/samba/tests/__init__.py9
1 files changed, 2 insertions, 7 deletions
diff --git a/python/samba/tests/__init__.py b/python/samba/tests/__init__.py
index 03c21c2bc88..cbd164de1f9 100644
--- a/python/samba/tests/__init__.py
+++ b/python/samba/tests/__init__.py
@@ -19,7 +19,6 @@
"""Samba Python tests."""
from __future__ import print_function
import os
-import shutil
import tempfile
import warnings
import ldb
@@ -295,15 +294,11 @@ class TestCaseInTempDir(TestCase):
super(TestCaseInTempDir, self).setUp()
self.tempdir = tempfile.mkdtemp()
self.addCleanup(self._remove_tempdir)
- self.check_tempdir_empty = True
def _remove_tempdir(self):
# Note asserting here is treated as an error rather than a test failure
- if self.check_tempdir_empty:
- self.assertEquals([], os.listdir(self.tempdir))
- os.rmdir(self.tempdir)
- else:
- shutil.rmtree(self.tempdir)
+ self.assertEquals([], os.listdir(self.tempdir))
+ os.rmdir(self.tempdir)
self.tempdir = None
@contextmanager