Consolidate test

Author: maxrjones

src/zarr/testing/store.py

@@ -152,10 +152,53 @@ async def test_read_only_store_raises(self, open_kwargs: dict[str, Any]) -> None
     async def test_with_read_only_store(self, open_kwargs: dict[str, Any]) -> None:
         kwargs = {**open_kwargs, "read_only": True}
         store = await self.store_cls.open(**kwargs)
+        assert store.read_only
+
+        # Test that you cannot write to a read-only store
         with pytest.raises(
-            NotImplementedError, match="with_read_only is not implemented for this store type."
+            ValueError, match="store was opened in read-only mode and does not support writing"
         ):
-            store.with_read_only(read_only=False)
+            await store.set("foo", self.buffer_cls.from_bytes(b"bar"))
+
+        # Check if the store implements with_read_only
+        try:
+            writer = store.with_read_only(read_only=False)
+
+            # Test that you can write to a new store copy
+            assert not writer._is_open
+            assert not writer.read_only
+            await writer.set("foo", self.buffer_cls.from_bytes(b"bar"))
+            await writer.delete("foo")
+
+            # Test that you cannot write to the original store
+            assert store.read_only
+            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"))
+            with pytest.raises(
+                ValueError, match="store was opened in read-only mode and does not support writing"
+            ):
+                await store.delete("foo")
+
+            # Test that you cannot write to a read-only store copy
+            reader = store.with_read_only(read_only=True)
+            assert reader.read_only
+            with pytest.raises(
+                ValueError, match="store was opened in read-only mode and does not support writing"
+            ):
+                await reader.set("foo", self.buffer_cls.from_bytes(b"bar"))
+            with pytest.raises(
+                ValueError, match="store was opened in read-only mode and does not support writing"
+            ):
+                await reader.delete("foo")
+
+        except NotImplementedError:
+            # Test that stores that do not implement with_read_only raise NotImplementedError with the correct message
+            with pytest.raises(
+                NotImplementedError, match="with_read_only is not implemented for this store type."
+            ):
+                store.with_read_only(read_only=False)
 
     @pytest.mark.parametrize("key", ["c/0", "foo/c/0.0", "foo/0/0"])
     @pytest.mark.parametrize(

tests/test_store/test_memory.py

@@ -78,46 +78,6 @@ async def test_deterministic_size(
         np.testing.assert_array_equal(a[:3], 1)
         np.testing.assert_array_equal(a[3:], 0)
 
-    async def test_with_read_only_store(self, open_kwargs: dict[str, Any]) -> None:
-        kwargs = {**open_kwargs, "read_only": True}
-        store = await self.store_cls.open(**kwargs)
-        assert store.read_only
-
-        # Test that you cannot write to a read-only store
-        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"))
-
-        # Test that you can write to a copy that is not read-only
-        writer = store.with_read_only(read_only=False)
-        assert not writer._is_open
-        assert not writer.read_only
-        await writer.set("foo", self.buffer_cls.from_bytes(b"bar"))
-        await writer.delete("foo")
-
-        # Test that you cannot write to the original store
-        assert store.read_only
-        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"))
-        with pytest.raises(
-            ValueError, match="store was opened in read-only mode and does not support writing"
-        ):
-            await store.delete("foo")
-        # Test that you cannot write to a read-only store copy
-        reader = store.with_read_only(read_only=True)
-        assert reader.read_only
-        with pytest.raises(
-            ValueError, match="store was opened in read-only mode and does not support writing"
-        ):
-            await reader.set("foo", self.buffer_cls.from_bytes(b"bar"))
-        with pytest.raises(
-            ValueError, match="store was opened in read-only mode and does not support writing"
-        ):
-            await reader.delete("foo")
-
 
 # TODO: fix this warning
 @pytest.mark.filterwarnings("ignore:Unclosed client session:ResourceWarning")