diff --git a/tests/unit/test_fsspec_streaming.py b/tests/unit/test_fsspec_streaming.py index 6fe71e0a..30b9e7b4 100644 --- a/tests/unit/test_fsspec_streaming.py +++ b/tests/unit/test_fsspec_streaming.py @@ -2,6 +2,8 @@ from hdmf_zarr import NWBZarrIO from .utils import check_s3fs_ffspec_installed +import zarr + HAVE_FSSPEC = check_s3fs_ffspec_installed() @@ -24,3 +26,10 @@ def test_fsspec_streaming(self): self.assertEqual(len(nwbfile.electrode_groups), 2) self.assertEqual(len(nwbfile.electrodes), 1152) self.assertEqual(nwbfile.institution, "AIND") + + @unittest.skipIf(not HAVE_FSSPEC, "fsspec not installed") + def test_s3_open_with_consolidated_(self): + s3_path = "https://dandiarchive.s3.amazonaws.com/zarr/ccefbc9f-30e7-4a4c-b044-5b59d300040b/" + with NWBZarrIO(s3_path, mode='r') as read_io: + read_io.open() + self.assertIsInstance(read_io.file.store, zarr.storage.ConsolidatedMetadataStore) diff --git a/tests/unit/test_zarrio.py b/tests/unit/test_zarrio.py index 5ac9a79d..4de48108 100644 --- a/tests/unit/test_zarrio.py +++ b/tests/unit/test_zarrio.py @@ -181,8 +181,3 @@ def test_force_open_without_consolidated_fails(self): read_io._ZarrIO__open_file_consolidated(store=self.store, mode='r') except ValueError as e: self.fail("ZarrIO.__open_file_consolidated raised an unexpected ValueError: {}".format(e)) - - def test_s3_open_with_consolidated_(self): - s3_path = "https://dandiarchive.s3.amazonaws.com/zarr/ccefbc9f-30e7-4a4c-b044-5b59d300040b/" - with ZarrIO(s3_path, mode='r') as read_io: - self.assertIsInstance(read_io.file.store, zarr.storage.ConsolidatedMetadataStore)