Test get and set on closed stores

Author: maxrjones

src/zarr/storage/_zip.py

@@ -146,6 +146,8 @@ def _get(
         prototype: BufferPrototype,
         byte_range: ByteRequest | None = None,
     ) -> Buffer | None:
+        if not self._is_open:
+            self._sync_open()
         # docstring inherited
         try:
             with self._zf.open(key) as f:  # will raise KeyError
@@ -190,6 +192,8 @@ async def get_partial_values(
         return out
 
     def _set(self, key: str, value: Buffer) -> None:
+        if not self._is_open:
+            self._sync_open()
         # generally, this should be called inside a lock
         keyinfo = zipfile.ZipInfo(filename=key, date_time=time.localtime(time.time())[:6])
         keyinfo.compress_type = self.compression
@@ -203,6 +207,8 @@ def _set(self, key: str, value: Buffer) -> None:
     async def set(self, key: str, value: Buffer) -> None:
         # docstring inherited
         self._check_writable()
+        if not self._is_open:
+            self._sync_open()
         assert isinstance(key, str)
         if not isinstance(value, Buffer):
             raise TypeError("ZipStore.set(): `value` must a Buffer instance")

src/zarr/testing/store.py

@@ -66,6 +66,10 @@ def open_kwargs(self, store_kwargs: dict[str, Any]) -> dict[str, Any]:
     async def store(self, open_kwargs: dict[str, Any]) -> Store:
         return await self.store_cls.open(**open_kwargs)
 
+    @pytest.fixture
+    async def store_not_open(self, store_kwargs: dict[str, Any]) -> Store:
+        return self.store_cls(**store_kwargs)
+
     def test_store_type(self, store: S) -> None:
         assert isinstance(store, Store)
         assert isinstance(store, self.store_cls)
@@ -137,6 +141,17 @@ async def test_get(self, store: S, key: str, data: bytes, byte_range: ByteReques
         expected = data_buf[start:stop]
         assert_bytes_equal(observed, expected)
 
+    async def test_get_not_open(self, store_not_open: S) -> None:
+        """
+        Ensure that data can be read from the store that isn't yet open using the store.get method.
+        """
+        assert not store_not_open._is_open
+        data_buf = self.buffer_cls.from_bytes(b"\x01\x02\x03\x04")
+        key = "c/0"
+        await self.set(store_not_open, key, data_buf)
+        observed = await store_not_open.get(key, prototype=default_buffer_prototype())
+        assert_bytes_equal(observed, data_buf)
+
     async def test_get_raises(self, store: S) -> None:
         """
         Ensure that a ValueError is raise for invalid byte range syntax
@@ -211,6 +226,17 @@ async def test_set(self, store: S, key: str, data: bytes) -> None:
         observed = await self.get(store, key)
         assert_bytes_equal(observed, data_buf)
 
+    async def test_set_not_open(self, store_not_open: S) -> None:
+        """
+        Ensure that data can be written to the store that's not yet open using the store.set method.
+        """
+        assert not store_not_open._is_open
+        data_buf = self.buffer_cls.from_bytes(b"\x01\x02\x03\x04")
+        key = "c/0"
+        await store_not_open.set(key, data_buf)
+        observed = await self.get(store_not_open, key)
+        assert_bytes_equal(observed, data_buf)
+
     async def test_set_many(self, store: S) -> None:
         """
         Test that a dict of key : value pairs can be inserted into the store via the

tests/test_store/test_logging.py

@@ -11,6 +11,8 @@
 from zarr.testing.store import StoreTests
 
 if TYPE_CHECKING:
+    from _pytest.compat import LEGACY_PATH
+
     from zarr.abc.store import Store
 
 
@@ -28,8 +30,8 @@ async def set(self, store: LoggingStore, key: str, value: Buffer) -> None:
         (store._store.root / key).write_bytes(value.to_bytes())
 
     @pytest.fixture
-    def store_kwargs(self, local_store) -> dict[str, str]:
-        return {"store": local_store, "log_level": "DEBUG"}
+    def store_kwargs(self, tmpdir: LEGACY_PATH) -> dict[str, str]:
+        return {"store": LocalStore(str(tmpdir)), "log_level": "DEBUG"}
 
     @pytest.fixture
     def open_kwargs(self, tmpdir) -> dict[str, str]:

tests/test_store/test_wrapper.py

@@ -9,6 +9,8 @@
 from zarr.testing.store import StoreTests
 
 if TYPE_CHECKING:
+    from _pytest.compat import LEGACY_PATH
+
     from zarr.abc.store import Store
     from zarr.core.buffer.core import BufferPrototype
 
@@ -27,8 +29,8 @@ async def set(self, store: WrapperStore, key: str, value: Buffer) -> None:
         (store._store.root / key).write_bytes(value.to_bytes())
 
     @pytest.fixture
-    def store_kwargs(self, local_store) -> dict[str, str]:
-        return {"store": local_store}
+    def store_kwargs(self, tmpdir: LEGACY_PATH) -> dict[str, str]:
+        return {"store": LocalStore(str(tmpdir))}
 
     @pytest.fixture
     def open_kwargs(self, tmpdir) -> dict[str, str]: