Run delete nonexistent key test across all stores

Author: lukasbindreiter

src/zarr/storage/_obstore.py

@@ -186,13 +186,16 @@ def supports_deletes(self) -> bool:
     async def delete(self, key: str) -> None:
         # docstring inherited
         import obstore as obs
+        from obstore.exceptions import NotFoundError
 
         self._check_writable()
 
         # Some stores such as local filesystems, GCP and Azure raise an error
         # when deleting a non-existent key, while others such as S3 and in-memory do
         # not. We suppress the error to make the behavior consistent across all stores
-        with contextlib.suppress(FileNotFoundError):
+        # currently obstore raises FileNotFoundError, but in the future might raise
+        # NotFoundError instead, so let's suppress that too
+        with contextlib.suppress(FileNotFoundError, NotFoundError):
             await obs.delete_async(self.store, key)
 
     @property

src/zarr/testing/store.py

@@ -401,6 +401,11 @@ async def test_delete_dir(self, store: S) -> None:
         assert not await store.exists("foo/zarr.json")
         assert not await store.exists("foo/c/0")
 
+    async def test_delete_nonexistent_key_does_not_raise(self, store: S) -> None:
+        if not store.supports_deletes:
+            pytest.skip("store does not support deletes")
+        await store.delete("nonexistent_key")
+
     async def test_is_empty(self, store: S) -> None:
         assert await store.is_empty("")
         await self.set(

tests/test_store/test_object.py

@@ -75,9 +75,6 @@ def test_store_init_raises(self) -> None:
         with pytest.raises(TypeError):
             ObjectStore("path/to/store")
 
-    async def test_store_delete_nonexistent_key_does_not_raise(self, store: ObjectStore) -> None:
-        await store.delete("nonexistent_key")
-
 
 @pytest.mark.slow_hypothesis
 def test_zarr_hierarchy():