Merge pull request #207 from alimanfoo/dbm-test-cleanup

Clean up dbm files properly

Author: alimanfoo

zarr/storage.py

@@ -17,6 +17,7 @@
 import sys
 import multiprocessing
 from threading import Lock, RLock
+import glob
 
 
 import numpy as np
@@ -834,6 +835,20 @@ def atexit_rmtree(path,
         rmtree(path)
 
 
+def atexit_rmglob(path,
+                  glob=glob.glob,
+                  isdir=os.path.isdir,
+                  isfile=os.path.isfile,
+                  remove=os.remove,
+                  rmtree=shutil.rmtree):  # pragma: no cover
+    """Ensure removal of multiple files at interpreter exit."""
+    for p in glob(path):
+        if isfile(p):
+            remove(p)
+        elif isdir(p):
+            rmtree(p)
+
+
 class TempStore(DirectoryStore):
     """Directory store using a temporary directory for storage.
 

zarr/tests/test_storage.py

@@ -19,7 +19,8 @@
 from zarr.storage import (init_array, array_meta_key, attrs_key, DictStore,
                           DirectoryStore, ZipStore, init_group, group_meta_key,
                           getsize, migrate_1to2, TempStore, atexit_rmtree,
-                          NestedDirectoryStore, default_compressor, DBMStore, LMDBStore)
+                          NestedDirectoryStore, default_compressor, DBMStore,
+                          LMDBStore, atexit_rmglob)
 from zarr.meta import (decode_array_metadata, encode_array_metadata, ZARR_FORMAT,
                        decode_group_metadata, encode_group_metadata)
 from zarr.compat import PY2
@@ -763,11 +764,11 @@ class TestDBMStoreDumb(TestDBMStore):
 
     def create_store(self):
         path = tempfile.mktemp(suffix='.dumbdbm')
+        atexit_rmglob(path + '*')
         if PY2:  # pragma: py3 no cover
             import dumbdbm
         else:  # pragma: py2 no cover
             import dbm.dumb as dumbdbm
-        atexit.register(os.remove, path)
         store = DBMStore(path, flag='n', open=dumbdbm.open)
         return store
 
@@ -798,7 +799,7 @@ class TestDBMStoreNDBM(TestDBMStore):
 
             def create_store(self):
                 path = tempfile.mktemp(suffix='.ndbm')
-                atexit.register(os.remove, path)
+                atexit_rmglob(path + '*')
                 store = DBMStore(path, flag='n', open=ndbm.open)
                 return store