fix: remove cache tree when corrupt

Author: itkovian

lib/vsc/utils/cache.py

@@ -30,6 +30,7 @@
 """
 import diskcache as dc
 import logging
+import shutil
 import time
 
 
@@ -69,7 +70,11 @@ def __init__(self, filename, retain_old=True, raise_unpickable=False):
         self.retain_old = retain_old  # this is no longer used
 
         self.filename = filename
-        self.cache = dc.Cache(filename)
+        try:
+            self.cache = dc.Cache(filename)
+        except:
+            shutil.rmtree(filename)
+            self.cache = dc.Cache(filename)
 
         if not retain_old:
             self.cache.clear()

test/cache.py

@@ -102,15 +102,17 @@ def test_save_and_load(self):
 
         shutil.rmtree(tempdir)
 
-    def test_corrupt_gz_cache(self):
+    def test_corrupt_cache(self):
         """Test to see if we can handle a corrupt cache file"""
         tempdir = tempfile.mkdtemp()
-        # create a tempfilename
-        (handle, filename) = tempfile.mkstemp(dir=tempdir)
-        f = os.fdopen(handle, 'w')
-        f.write('blabla;not gz')
-        f.close()
-        FileCache(filename)
+
+        # create a bollocks cache file
+        with open(os.path.join(tempdir, "cache.db", "w")) as f:
+            f.write("blabla")
+
+        # this should clear the cache and create a new one
+        FileCache(tempdir)
+
         shutil.rmtree(tempdir)
 
     @mock.patch('vsc.utils.cache.jsonpickle.decode')