Match specific Errors in tests

Co-authored-by: Davis Bennett <[email protected]>

Author: maxrjones

src/zarr/storage/_fsspec.py

@@ -256,7 +256,7 @@ async def set(
         self._check_writable()
         if not isinstance(value, Buffer):
             raise TypeError(
-                f"FsspecStore.set(): `value` must a Buffer instance. Got an instance of {type(value)} instead."
+                f"FsspecStore.set(): `value` must be a Buffer instance. Got an instance of {type(value)} instead."
             )
         path = _dereference_path(self.path, key)
         # write data

src/zarr/storage/_local.py

@@ -169,7 +169,9 @@ async def _set(self, key: str, value: Buffer, exclusive: bool = False) -> None:
         self._check_writable()
         assert isinstance(key, str)
         if not isinstance(value, Buffer):
-            raise TypeError("LocalStore.set(): `value` must a Buffer instance")
+            raise TypeError(
+                f"LocalStore.set(): `value` must be a Buffer instance. Got an instance of {type(value)} instead."
+            )
         path = self.root / key
         await asyncio.to_thread(_put, path, value, start=None, exclusive=exclusive)
 

src/zarr/storage/_memory.py

@@ -111,7 +111,9 @@ async def set(self, key: str, value: Buffer, byte_range: tuple[int, int] | None
         await self._ensure_open()
         assert isinstance(key, str)
         if not isinstance(value, Buffer):
-            raise TypeError(f"Expected Buffer. Got {type(value)}.")
+            raise TypeError(
+                f"MemoryStore.set(): `value` must be a Buffer instance. Got an instance of {type(value)} instead."
+            )
 
         if byte_range is not None:
             buf = self._store_dict[key]

src/zarr/storage/_zip.py

@@ -211,7 +211,9 @@ async def set(self, key: str, value: Buffer) -> None:
             self._sync_open()
         assert isinstance(key, str)
         if not isinstance(value, Buffer):
-            raise TypeError("ZipStore.set(): `value` must a Buffer instance")
+            raise TypeError(
+                f"ZipStore.set(): `value` must be a Buffer instance. Got an instance of {type(value)} instead."
+            )
         with self._lock:
             self._set(key, value)
 

src/zarr/testing/store.py

@@ -121,7 +121,7 @@ async def test_store_context_manager(self, open_kwargs: dict[str, Any]) -> None:
         with await self.store_cls.open(**open_kwargs) as store:
             assert store._is_open
             # Test trying to open an already open store
-            with pytest.raises(ValueError):
+            with pytest.raises(ValueError, match="store is already open"):
                 await store._open()
         assert not store._is_open
 
@@ -131,11 +131,15 @@ async def test_read_only_store_raises(self, open_kwargs: dict[str, Any]) -> None
         assert store.read_only
 
         # set
-        with pytest.raises(ValueError):
+        with pytest.raises(
+            ValueError, match="store was opened in read-only mode and does not support writing"
+        ):
             await store.set("foo", self.buffer_cls.from_bytes(b"bar"))
 
         # delete
-        with pytest.raises(ValueError):
+        with pytest.raises(
+            ValueError, match="store was opened in read-only mode and does not support writing"
+        ):
             await store.delete("foo")
 
     @pytest.mark.parametrize("key", ["c/0", "foo/c/0.0", "foo/0/0"])
@@ -171,7 +175,7 @@ async def test_get_raises(self, store: S) -> None:
         """
         data_buf = self.buffer_cls.from_bytes(b"\x01\x02\x03\x04")
         await self.set(store, "c/0", data_buf)
-        with pytest.raises((ValueError, TypeError)):
+        with pytest.raises((ValueError, TypeError), match=r"Unexpected byte_range, got.*"):
             await store.get("c/0", prototype=default_buffer_prototype(), byte_range=(0, 2))  # type: ignore[arg-type]
 
     async def test_get_many(self, store: S) -> None:
@@ -222,7 +226,7 @@ async def test_getsize_prefix(self, store: S) -> None:
 
     async def test_getsize_raises(self, store: S) -> None:
         """
-        Test the result of store.getsize().
+        Test that getsize() raise a FileNotFoundError if the key doesn't exist.
         """
         with pytest.raises(FileNotFoundError):
             await store.getsize("c/1000")
@@ -266,7 +270,10 @@ async def test_set_invalid_buffer(self, store: S) -> None:
         """
         Ensure that set raises a Type or Value Error for invalid buffer arguments.
         """
-        with pytest.raises((ValueError, TypeError)):
+        with pytest.raises(
+            (ValueError, TypeError),
+            match=r"\S+\.set\(\): `value` must be a Buffer instance. Got an instance of <class 'int'> instead.",
+        ):
             await store.set("c/0", 0)  # type: ignore[arg-type]
 
     @pytest.mark.parametrize(