diff --git a/docs/release.rst b/docs/release.rst index ca81f68b2d..c215b0f9cd 100644 --- a/docs/release.rst +++ b/docs/release.rst @@ -6,6 +6,12 @@ Release notes Unreleased ---------- +Maintenance +~~~~~~~~~~~ + +* Mark the fact that some tests that require ``fsspec``, without compromising the code coverage score. + By :user:`Ben Williams `; :issue:`823`. + .. _release_2.9.2: 2.9.2 diff --git a/zarr/tests/test_dim_separator.py b/zarr/tests/test_dim_separator.py index 7b2cb41606..bc2e471b55 100644 --- a/zarr/tests/test_dim_separator.py +++ b/zarr/tests/test_dim_separator.py @@ -9,6 +9,9 @@ from zarr.tests.util import have_fsspec +needs_fsspec = pytest.mark.skipif(not have_fsspec, reason="needs fsspec") + + @pytest.fixture(params=("static_nested", "static_flat", "directory_nested", @@ -16,9 +19,9 @@ "directory_default", "nesteddirectory_nested", "nesteddirectory_default", - "fs_nested", - "fs_flat", - "fs_default")) + pytest.param("fs_nested", marks=needs_fsspec), + pytest.param("fs_flat", marks=needs_fsspec), + pytest.param("fs_default", marks=needs_fsspec))) def dataset(tmpdir, request): """ Generate a variety of different Zarrs using @@ -42,8 +45,6 @@ def dataset(tmpdir, request): elif which.startswith("nested"): store_class = NestedDirectoryStore else: - if have_fsspec is False: - pytest.skip("no fsspec") # pragma: no cover store_class = FSStore kwargs["mode"] = "w" kwargs["auto_mkdir"] = True @@ -66,7 +67,7 @@ def test_open(dataset): verify(zarr.open(dataset, "r")) -@pytest.mark.skipif(have_fsspec is False, reason="needs fsspec") +@needs_fsspec def test_fsstore(dataset): verify(Array(store=FSStore(dataset)))