get storage tests running

Author: alimanfoo

.gitignore

@@ -67,4 +67,4 @@ zarr/version.py
 *~
 *.zip
 example
-
+doesnotexist

zarr/storage.py

@@ -488,7 +488,7 @@ def __init__(self, path):
 
         # guard conditions
         path = os.path.abspath(path)
-        if os.path.exists and not os.path.isdir(path):
+        if os.path.exists(path) and not os.path.isdir(path):
             raise ValueError('path exists but is not a directory')
 
         self.path = path
@@ -552,15 +552,15 @@ def __eq__(self, other):
         )
 
     def keys(self):
-        dirnames = [self.path]
-        while dirnames:
-            dirname = dirnames.pop()
+        todo = [(self.path, '')]
+        while todo:
+            dirname, prefix = todo.pop()
             for name in os.listdir(dirname):
                 path = os.path.join(dirname, name)
                 if os.path.isfile(path):
-                    yield path
+                    yield prefix + name
                 elif os.path.isdir(path):
-                    dirnames.append(path)
+                    todo.append((path, prefix + name + '/'))
 
     def __iter__(self):
         return self.keys()

zarr/tests/test_storage.py

@@ -14,7 +14,7 @@
 from nose.tools import assert_raises, eq_ as eq, assert_is_none
 
 
-from zarr.storage import DirectoryStore, MemoryStore, ZipStore, init_array
+from zarr.storage import DirectoryStore, DictStore, ZipStore, init_array
 from zarr.meta import decode_metadata
 from zarr.compat import text_type
 
@@ -78,15 +78,13 @@ def test_get_set_del_contains(self):
         except NotImplementedError:
             pass
 
-        # check writeable values
-        with assert_raises(TypeError):
-            # non-writeable value
-            store['foo'] = 42
-        # alternative values
+    def test_writeable_values(self):
+        store = self.create_store()
+        # store should accept anything that implements buffer interface
+        store['foo'] = b'bar'
         store['foo'] = bytearray(b'bar')
-        eq(b'bar', store['foo'])
         store['foo'] = array.array('B', b'bar')
-        eq(b'bar', store['foo'])
+        store['foo'] = np.frombuffer(b'bar', dtype='u1')
 
     def test_update(self):
         store = self.create_store()
@@ -137,10 +135,16 @@ def test_pickle(self):
                 eq(v, getattr(store2, k))
 
 
-class TestMemoryStore(StoreTests, unittest.TestCase):
+class TestGenericStore(StoreTests, unittest.TestCase):
 
     def create_store(self):
-        return MemoryStore()
+        return dict()
+
+
+class TestDictStore(StoreTests, unittest.TestCase):
+
+    def create_store(self):
+        return DictStore()
 
 
 class TestDirectoryStore(StoreTests, unittest.TestCase):
@@ -154,10 +158,14 @@ def create_store(self):
     def test_path(self):
 
         # test behaviour with path that does not exist
-        if os.path.exists('doesnotexist'):
-            shutil.rmtree('doesnotexist')
-        DirectoryStore('doesnotexist')
-        assert os.path.isdir('doesnotexist')
+        path = 'doesnotexist'
+        if os.path.exists(path):
+            shutil.rmtree(path)
+        store = DirectoryStore(path)
+        # should only be created on demand
+        assert not os.path.exists(path)
+        store['foo'] = b'bar'
+        assert os.path.isdir(path)
 
         # test behaviour with file path
         with tempfile.NamedTemporaryFile() as f:
@@ -184,12 +192,3 @@ def create_store(self):
         atexit.register(os.remove, path)
         store = ZipStore(path)
         return store
-
-
-class TestZipStoreMulti(StoreTests, unittest.TestCase):
-
-    def create_store(self):
-        path = tempfile.mktemp(suffix='.zip')
-        atexit.register(os.remove, path)
-        store = ZipStore(path, arcpath='foo/bar')
-        return store