Merge pull request #2 from maxrjones/update-tests

Update obstore tests

Author: kylebarron

pyproject.toml

@@ -70,7 +70,7 @@ test = [
     "mypy",
     "hypothesis",
     "universal-pathlib",
-    "obstore==0.3.0b8",
+    "obstore==0.3.0b9",
 ]
 
 jupyter = [

src/zarr/storage/object_store.py

@@ -38,18 +38,29 @@ def __eq__(self, value: object) -> bool:
         if not isinstance(value, ObjectStore):
             return False
 
-        return self.store.__eq__(value.store)
+        return bool(self.store.__eq__(value.store))
 
     def __init__(self, store: _ObjectStore, *, read_only: bool = False) -> None:
+        if not isinstance(
+            store,
+            (
+                obs.store.AzureStore,
+                obs.store.GCSStore,
+                obs.store.HTTPStore,
+                obs.store.S3Store,
+                obs.store.LocalStore,
+                obs.store.MemoryStore,
+            ),
+        ):
+            raise TypeError(f"expected ObjectStore class, got {store!r}")
         self.store = store
-
         super().__init__(read_only=read_only)
 
     def __str__(self) -> str:
         return f"object://{self.store}"
 
     def __repr__(self) -> str:
-        return f"ObjectStore({self!r})"
+        return f"ObjectStore({self})"
 
     async def get(
         self, key: str, prototype: BufferPrototype, byte_range: ByteRangeRequest | None = None

tests/test_store/test_object.py

@@ -1,7 +1,7 @@
 # ruff: noqa: E402
 import pytest
 
-pytest.importorskip("obstore")
+obstore = pytest.importorskip("obstore")
 
 from zarr.core.buffer import cpu
 from zarr.storage.object_store import ObjectStore
@@ -10,3 +10,13 @@
 
 class TestObjectStore(StoreTests[ObjectStore, cpu.Buffer]):
     store_cls = ObjectStore
+    buffer_cls = cpu.Buffer
+
+    @pytest.fixture
+    def store_kwargs(self, tmpdir) -> dict[str, str | bool]:
+        store = obstore.store.LocalStore(prefix=tmpdir)
+        return {"store": store, "read_only": False}
+
+    @pytest.fixture
+    def store(self, store_kwargs: dict[str, str | bool]) -> ObjectStore:
+        return self.store_cls(**store_kwargs)