Add a couple of little tests

Author: Martin Durant

zarr/storage.py

@@ -950,14 +950,17 @@ def atexit_rmglob(path,
 class FSStore(MutableMapping):
 
     def __init__(self, url, normalize_keys=True, key_separator='.',
-                 mode='w', consolidated=False, metadata_key='.zmetadata', **storage_options):
+                 mode='w', consolidated=False, metadata_key='.zmetadata',
+                 exceptions=(KeyError, PermissionError, IOError),
+                 **storage_options):
         import fsspec
         self.path = url
         self.normalize_keys = normalize_keys
         self.key_separator = key_separator
         self.map = fsspec.get_mapper(url, **storage_options)
         self.fs = self.map.fs  # for direct operations
         self.mode = mode
+        self.exceptions = exceptions
         # TODO: should warn if consolidated and write mode?
         if self.fs.exists(url) and not self.fs.isdir(url):
             err_fspath_exists_notdir(url)
@@ -988,7 +991,10 @@ def __getitem__(self, key):
         if self.consolidated and self._is_meta(key):
             return self.meta[key]
         key = self._normalize_key(key)
-        return self.map[key]
+        try:
+            return self.map[key]
+        except self.exceptions  as e:
+            raise KeyError(key) from e
 
     def __setitem__(self, key, value):
         if self.mode == 'r':
@@ -1003,8 +1009,8 @@ def __setitem__(self, key, value):
             if self.fs.isdir(path):
                 self.fs.rm(path, recursive=True)
             self.map[key] = value
-        except IOError:
-            raise KeyError(key)
+        except self.exceptions as e:
+            raise KeyError(key) from e
 
     def __delitem__(self, key):
         if self.mode == 'r':

zarr/tests/test_storage.py

@@ -852,6 +852,18 @@ def test_complex(self):
         assert store["foo"] == b"hello"
         assert 'foo' in os.listdir(path2)
 
+    def test_consolidated(self):
+        path = tempfile.mkdtemp()
+        store = FSStore(path, consolidated=True)
+        store[".zarray"] = b"{}"
+        assert ".zmetadata" in os.listdir(path)
+
+    def test_not_fsspec(self):
+        import zarr
+        path = tempfile.mkdtemp()
+        with pytest.raises(ValueError, match="storage_options"):
+            zarr.open_array(path, mode='w', storage_options={"some": "kwargs"})
+
 
 class TestNestedDirectoryStore(TestDirectoryStore, unittest.TestCase):
 

zarr/tests/util.py

@@ -54,7 +54,7 @@ def skip_test_env_var(name):
     if LooseVersion(sys.version) >= LooseVersion("3.6"):
         import fsspec  # noqa: F401
         have_fsspec = True
-    else:
+    else:  # pragma: no cover
         have_fsspec = False
-except ImportError:
+except ImportError:  # pragma: no cover
     have_fsspec = False