diff --git a/tuf/unittest_toolbox.py b/tuf/unittest_toolbox.py index 67ef7286..b9ced979 100755 --- a/tuf/unittest_toolbox.py +++ b/tuf/unittest_toolbox.py @@ -85,7 +85,7 @@ def tearDown(self): try: # OSError will occur if the directory was already removed. cleanup_function() - + except OSError: pass @@ -93,11 +93,15 @@ def tearDown(self): def make_temp_directory(self, directory=None): """Creates and returns an absolute path of a directory.""" + prefix = self.__class__.__name__+'_' temp_directory = tempfile.mkdtemp(prefix=prefix, dir=directory) + def _destroy_temp_directory(): shutil.rmtree(temp_directory) + self._cleanup.append(_destroy_temp_directory) + return temp_directory