Secure removal of the temp file used by the testing suite

5 files changed, 12 insertions, 7 deletions

diff --git a/test/clean.jpg b/test/clean.jpg
index be06da5..4e89b40 100644
--- a/test/clean.jpg
+++ b/test/clean.jpg
diff --git a/test/clean.png b/test/clean.png
index 2ce9efd..9339196 100644
--- a/test/clean.png
+++ b/test/clean.png
diff --git a/test/dirty.jpg b/test/dirty.jpg
index a075590..71c32c7 100644
--- a/test/dirty.jpg
+++ b/test/dirty.jpg
diff --git a/test/dirty.png b/test/dirty.png
index f37213f..5e4c093 100644
--- a/test/dirty.png
+++ b/test/dirty.png
diff --git a/test/test.py b/test/test.py
index f095157..f856394 100644
--- a/test/test.py
+++ b/test/test.py
@@ -6,6 +6,7 @@
 '''
 
 import shutil
+import os
 import glob
 import sys
 import tempfile
@@ -18,14 +19,18 @@ FILE_LIST = zip(glob.glob('clean*'), glob.glob('dirty*'))
 class MATTest(unittest.TestCase):
     def setUp(self):
         '''create working copy of the clean and the dirty file in the TMP dir'''
-        self.file_list = []
-        self.tmpdir = tempfile.mkdtemp()
+        self.file_list = []
+        self.tmpdir = tempfile.mkdtemp()
 
-        for clean, dirty in FILE_LIST:
-            shutil.copy2(clean, self.tmpdir + clean)
-            shutil.copy2(dirty, self.tmpdir + dirty)
-            self.file_list.append((self.tmpdir + clean, self.tmpdir + dirty))
+        for clean, dirty in FILE_LIST:
+            shutil.copy2(clean, self.tmpdir + clean)
+            shutil.copy2(dirty, self.tmpdir + dirty)
+            self.file_list.append((self.tmpdir + clean, self.tmpdir + dirty))
 
     def tearDown(self):
         '''Remove the tmp folder'''
-        shutil.rmtree(self.tmpdir)
+        for root, dirs, files in os.walk(self.tmpdir, topdown=False):
+            for name in files:
+                mat.secure_remove(os.path.join(toor, name))
+            for name in dirs:
+                os.rmdir(os.path.join(root, name))