Non-writtables test files are now chmod'ed to be properly removed.

2 files changed, 15 insertions, 1 deletions

diff --git a/MAT/exceptions.py b/MAT/exceptions.py
index 7972f20..47da15c 100644
--- a/MAT/exceptions.py
+++ b/MAT/exceptions.py
@@ -6,3 +6,9 @@ class UnableToRemoveFile(Exception):
     '''This exception is raised when a file could not be removed
     '''
     pass
+
+class UnableToWriteFile(Exception):
+    '''This exception is raised when a file
+        can could not be chmod +w
+    '''
+    pass
diff --git a/MAT/mat.py b/MAT/mat.py
index 4d64c2d..32f55d8 100644
--- a/MAT/mat.py
+++ b/MAT/mat.py
@@ -112,6 +112,13 @@ class XMLParser(xml.sax.handler.ContentHandler):
 def secure_remove(filename):
     ''' Securely remove the file
     '''
+    # I want the file removed, even if it's ro
+    try:
+        os.chmod(filename, 0o777)
+    except OSError:
+        logging.error('Unable to add write rights to %s' % filename)
+        raise MAT.exceptions.UnableToWriteFile
+
     try:
         if not subprocess.call(['shred', '--remove', filename]):
             return True
@@ -122,11 +129,12 @@ def secure_remove(filename):
 
     try:
         os.remove(filename)
-        return True
     except OSError:
         logging.error('Unable to remove %s' % filename)
         raise MAT.exceptions.UnableToRemoveFile
 
+    return True
+
 
 def create_class_file(name, backup, **kwargs):
     ''' Return a $FILETYPEStripper() class,