properly construct remotestore instance in test fixture

Author: d-v-b

tests/conftest.py

@@ -5,8 +5,6 @@
 from dataclasses import dataclass, field
 from typing import TYPE_CHECKING
 
-import botocore
-import fsspec
 import numpy as np
 import numpy.typing as npt
 import pytest
@@ -23,6 +21,7 @@
     from collections.abc import Generator
     from typing import Any, Literal
 
+    import botocore
     from _pytest.compat import LEGACY_PATH
 
     from zarr.core.common import ChunkCoords, MemoryOrder, ZarrFormat
@@ -47,8 +46,11 @@ async def parse_store(
     if store == "memory":
         return await MemoryStore.open(mode="a")
     if store == "remote":
-        fs = fsspec.filesystem("s3", endpoint_url=endpoint_url, anon=False, asynchronous=True)
-        return await RemoteStore.open(fs, mode="a")
+        return RemoteStore.from_url(
+            f"s3://{test_bucket_name}/foo/spam/",
+            mode="a",
+            storage_options={"endpoint_url": endpoint_url, "anon": False},
+        )
     if store == "zip":
         return await ZipStore.open(path + "/zarr.zip", mode="a")
     raise AssertionError
@@ -167,7 +169,7 @@ def get_boto3_client() -> botocore.client.BaseClient:
 
 
 @pytest.fixture(autouse=True)
-def s3(s3_base: None) -> Generator[s3fs.S3FileSystem, None, None]:
+def s3(s3_base: None) -> Generator[s3fs.S3FileSystem, None, None]:  # type: ignore[name-defined]
     """
     Quoting Martin Durant:
     pytest-asyncio creates a new event loop for each async test.

tests/test_store/test_remote.py

@@ -14,68 +14,6 @@
 
 from ..conftest import endpoint_url, test_bucket_name
 
-# s3fs = pytest.importorskip("s3fs")
-# requests = pytest.importorskip("requests")
-# moto_server = pytest.importorskip("moto.moto_server.threaded_moto_server")
-# moto = pytest.importorskip("moto")
-
-# # ### amended from s3fs ### #
-# test_bucket_name = "test"
-# secure_bucket_name = "test-secure"
-# port = 5555
-# endpoint_url = f"http://127.0.0.1:{port}/"
-
-
-# @pytest.fixture(scope="module")
-# def s3_base() -> Generator[None, None, None]:
-#     # writable local S3 system
-
-#     # This fixture is module-scoped, meaning that we can reuse the MotoServer across all tests
-#     server = moto_server.ThreadedMotoServer(ip_address="127.0.0.1", port=port)
-#     server.start()
-#     if "AWS_SECRET_ACCESS_KEY" not in os.environ:
-#         os.environ["AWS_SECRET_ACCESS_KEY"] = "foo"
-#     if "AWS_ACCESS_KEY_ID" not in os.environ:
-#         os.environ["AWS_ACCESS_KEY_ID"] = "foo"
-
-#     yield
-#     server.stop()
-
-
-# def get_boto3_client() -> botocore.client.BaseClient:
-#     # NB: we use the sync botocore client for setup
-#     session = Session()
-#     return session.create_client("s3", endpoint_url=endpoint_url)
-
-
-# @pytest.fixture(autouse=True)
-# def s3(s3_base: None) -> Generator[s3fs.S3FileSystem, None, None]:
-#     """
-#     Quoting Martin Durant:
-#     pytest-asyncio creates a new event loop for each async test.
-#     When an async-mode s3fs instance is made from async, it will be assigned to the loop from
-#     which it is made. That means that if you use s3fs again from a subsequent test,
-#     you will have the same identical instance, but be running on a different loop - which fails.
-
-#     For the rest: it's very convenient to clean up the state of the store between tests,
-#     make sure we start off blank each time.
-
-#     https://github.com/zarr-developers/zarr-python/pull/1785#discussion_r1634856207
-#     """
-#     client = get_boto3_client()
-#     client.create_bucket(Bucket=test_bucket_name, ACL="public-read")
-#     s3fs.S3FileSystem.clear_instance_cache()
-#     s3 = s3fs.S3FileSystem(anon=False, client_kwargs={"endpoint_url": endpoint_url})
-#     session = sync(s3.set_session())
-#     s3.invalidate_cache()
-#     yield s3
-#     requests.post(f"{endpoint_url}/moto-api/reset")
-#     client.close()
-#     sync(session.close())
-
-
-# # ### end from s3fs ### #
-
 
 async def test_basic() -> None:
     store = RemoteStore.from_url(