Merge pull request #209 from alimanfoo/dbm-test-cleanup-4real

Fix test atexit

Author: alimanfoo

zarr/tests/test_convenience.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, print_function, division
 import tempfile
+import atexit
 
 
 from nose.tools import assert_raises
@@ -17,7 +18,7 @@
 def test_open_array():
 
     store = tempfile.mkdtemp()
-    atexit_rmtree(store)
+    atexit.register(atexit_rmtree, store)
 
     # open array, create if doesn't exist
     z = open(store, mode='a', shape=100)
@@ -43,7 +44,7 @@ def test_open_array():
 def test_open_group():
 
     store = tempfile.mkdtemp()
-    atexit_rmtree(store)
+    atexit.register(atexit_rmtree, store)
 
     # open group, create if doesn't exist
     g = open(store, mode='a')

zarr/tests/test_core.py

@@ -16,7 +16,7 @@
 
 
 from zarr.storage import (DirectoryStore, init_array, init_group, NestedDirectoryStore,
-                          DBMStore, LMDBStore, atexit_rmtree)
+                          DBMStore, LMDBStore, atexit_rmtree, atexit_rmglob)
 from zarr.core import Array
 from zarr.errors import PermissionError
 from zarr.compat import PY2
@@ -933,8 +933,8 @@ class TestArrayWithDBMStore(TestArray):
 
     @staticmethod
     def create_array(read_only=False, **kwargs):
-        path = mktemp(suffix='.dbm')
-        atexit.register(os.remove, path)
+        path = mktemp(suffix='.anydbm')
+        atexit.register(atexit_rmglob, path + '*')
         store = DBMStore(path, flag='n')
         kwargs.setdefault('compressor', Zlib(1))
         init_array(store, **kwargs)
@@ -970,7 +970,7 @@ class TestArrayWithLMDBStore(TestArray):
     @staticmethod
     def create_array(read_only=False, **kwargs):
         path = mktemp(suffix='.lmdb')
-        atexit_rmtree(path)
+        atexit.register(atexit_rmtree, path)
         try:
             store = LMDBStore(path, buffers=True)
         except ImportError:  # pragma: no cover
@@ -988,7 +988,7 @@ class TestArrayWithLMDBStoreNoBuffers(TestArray):
     @staticmethod
     def create_array(read_only=False, **kwargs):
         path = mktemp(suffix='.lmdb')
-        atexit_rmtree(path)
+        atexit.register(atexit_rmtree, path)
         try:
             store = LMDBStore(path, buffers=False)
         except ImportError:  # pragma: no cover

zarr/tests/test_hierarchy.py

@@ -19,7 +19,7 @@
 
 from zarr.storage import (DictStore, DirectoryStore, ZipStore, init_group, init_array,
                           array_meta_key, group_meta_key, atexit_rmtree,
-                          NestedDirectoryStore, DBMStore, LMDBStore)
+                          NestedDirectoryStore, DBMStore, LMDBStore, atexit_rmglob)
 from zarr.core import Array
 from zarr.compat import PY2, text_type
 from zarr.hierarchy import Group, group, open_group
@@ -884,8 +884,8 @@ class TestGroupWithDBMStore(TestGroup):
 
     @staticmethod
     def create_store():
-        path = tempfile.mktemp(suffix='.dbm')
-        atexit.register(os.remove, path)
+        path = tempfile.mktemp(suffix='.anydbm')
+        atexit.register(atexit_rmglob, path + '*')
         store = DBMStore(path, flag='n')
         return store, None
 
@@ -911,7 +911,7 @@ class TestGroupWithLMDBStore(TestGroup):
     @staticmethod
     def create_store():
         path = tempfile.mktemp(suffix='.lmdb')
-        atexit_rmtree(path)
+        atexit.register(atexit_rmtree, path)
         try:
             store = LMDBStore(path)
         except ImportError:  # pragma: no cover

zarr/tests/test_storage.py

@@ -748,8 +748,8 @@ def test_pop(self):
 class TestDBMStore(StoreTests, unittest.TestCase):
 
     def create_store(self):
-        path = tempfile.mktemp(suffix='.dbm')
-        atexit.register(os.remove, path)
+        path = tempfile.mktemp(suffix='.anydbm')
+        atexit.register(atexit_rmglob, path + '*')
         store = DBMStore(path, flag='n')
         return store
 
@@ -764,7 +764,7 @@ class TestDBMStoreDumb(TestDBMStore):
 
     def create_store(self):
         path = tempfile.mktemp(suffix='.dumbdbm')
-        atexit_rmglob(path + '*')
+        atexit.register(atexit_rmglob, path + '*')
         if PY2:  # pragma: py3 no cover
             import dumbdbm
         else:  # pragma: py2 no cover
@@ -799,7 +799,7 @@ class TestDBMStoreNDBM(TestDBMStore):
 
             def create_store(self):
                 path = tempfile.mktemp(suffix='.ndbm')
-                atexit_rmglob(path + '*')
+                atexit.register(atexit_rmglob, path + '*')
                 store = DBMStore(path, flag='n', open=ndbm.open)
                 return store
 
@@ -826,7 +826,7 @@ class TestLMDBStore(StoreTests, unittest.TestCase):
 
     def create_store(self):
         path = tempfile.mktemp(suffix='.lmdb')
-        atexit_rmtree(path)
+        atexit.register(atexit_rmtree, path)
         if PY2:  # pragma: py3 no cover
             # don't use buffers, otherwise would have to rewrite tests as bytes and
             # buffer don't compare equal in PY2