more coverage

Author: Martin Durant

zarr/storage.py

@@ -970,7 +970,7 @@ def __init__(self, url, normalize_keys=True, key_separator='.',
             self.meta = json.loads(self.map.get(metadata_key, b"{}").decode())
             if mode == 'r' or 'zarr_consolidated_format' in self.meta:
                 consolidated_format = self.meta.get('zarr_consolidated_format', None)
-                if consolidated_format != 1:
+                if consolidated_format != 1:  # pragma: no cover
                     raise MetadataError('unsupported zarr consolidated metadata format: %s' %
                                         consolidated_format)
             else:
@@ -989,11 +989,11 @@ def _normalize_key(self, key):
 
     def __getitem__(self, key):
         if self.consolidated and self._is_meta(key):
-            return self.meta[key]
+            return self.meta[key].encode()  # expect bytes out
         key = self._normalize_key(key)
         try:
             return self.map[key]
-        except self.exceptions  as e:
+        except self.exceptions as e:
             raise KeyError(key) from e
 
     def __setitem__(self, key, value):
@@ -1032,7 +1032,8 @@ def __contains__(self, key):
         return key in self.map
 
     def __eq__(self, other):
-        return type(self) == type(other) and self.map == other.map
+        return (type(self) == type(other) and self.map == other.map
+                and self.mode == other.mode)
 
     def keys(self):
         return iter(self.map)

zarr/tests/test_storage.py

@@ -857,12 +857,31 @@ def test_consolidated(self):
         store = FSStore(path, consolidated=True)
         store[".zarray"] = b"{}"
         assert ".zmetadata" in os.listdir(path)
+        del store[".zarray"]
+        with pytest.raises(KeyError):
+            store[".zarray"]
+        store[".zarray"] = b"{}"
+
+        os.remove(os.path.join(path, ".zarray"))
+        store2 = FSStore(path, mode='r', consolidated=True)
+        assert store != store2
+        assert ".zarray" in store2
+        assert store2[".zarray"] == b"{}"
+        with pytest.raises(PermissionError):
+            store2[".zarray"] = b"{{}}"
+        with pytest.raises(PermissionError):
+            del store2[".zarray"]
+
+        store.clear()
+        assert ".zmetadata" not in store
 
     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"})
+        with pytest.raises(ValueError, match="storage_options"):
+            zarr.open_group(path, mode='w', storage_options={"some": "kwargs"})
 
 
 class TestNestedDirectoryStore(TestDirectoryStore, unittest.TestCase):