Skip to content

Commit ae42bff

Browse files
committed
Address feedback
1 parent ad3df88 commit ae42bff

File tree

2 files changed

+14
-13
lines changed

2 files changed

+14
-13
lines changed

tests/v3/conftest.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ async def store(request: pytest.FixtureRequest, tmpdir: LEGACY_PATH) -> Store:
7979

8080

8181
@pytest.fixture(params=["local", "memory", "zip"])
82-
def sync_store(request: pytest.FixtureRequest, tmpdir: LEGACY_PATH) -> Store:
83-
result = sync(parse_store(request.param, str(tmpdir)))
82+
def sync_store(request: pytest.FixtureRequest, tmp_path: LEGACY_PATH) -> Store:
83+
result = sync(parse_store(request.param, str(tmp_path)))
8484
if not isinstance(result, Store):
8585
raise TypeError("Wrong store class returned by test fixture! got " + result + " instead")
8686
return result

tests/v3/test_store/test_stateful_store.py

+12-11
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
from zarr.abc.store import AccessMode, Store
1818
from zarr.core.buffer import BufferPrototype, cpu, default_buffer_prototype
1919
from zarr.store import LocalStore, ZipStore
20-
from zarr.testing.strategies import key_ranges, keys
20+
from zarr.testing.strategies import key_ranges
21+
from zarr.testing.strategies import keys as zarr_keys
2122

2223

2324
class SyncStoreWrapper(zarr.core.sync.SyncMixin):
@@ -105,7 +106,7 @@ class ZarrStoreStateMachine(RuleBasedStateMachine):
105106
https://hypothesis.readthedocs.io/en/latest/stateful.html
106107
"""
107108

108-
def __init__(self, store) -> None:
109+
def __init__(self, store: Store) -> None:
109110
super().__init__()
110111
self.model: dict[str, bytes] = {}
111112
self.store = SyncStoreWrapper(store)
@@ -115,7 +116,7 @@ def __init__(self, store) -> None:
115116
def init_store(self):
116117
self.store.clear()
117118

118-
@rule(key=keys, data=st.binary(min_size=0, max_size=100))
119+
@rule(key=zarr_keys, data=st.binary(min_size=0, max_size=100))
119120
def set(self, key: str, data: DataObject) -> None:
120121
note(f"(set) Setting {key!r} with {data}")
121122
assert not self.store.mode.readonly
@@ -124,7 +125,7 @@ def set(self, key: str, data: DataObject) -> None:
124125
self.model[key] = data_buf
125126

126127
@precondition(lambda self: len(self.model.keys()) > 0)
127-
@rule(key=keys, data=st.data())
128+
@rule(key=zarr_keys, data=st.data())
128129
def get(self, key: str, data: DataObject) -> None:
129130
key = data.draw(
130131
st.sampled_from(sorted(self.model.keys()))
@@ -134,8 +135,8 @@ def get(self, key: str, data: DataObject) -> None:
134135
# to bytes here necessary because data_buf set to model in set()
135136
assert self.model[key].to_bytes() == (store_value.to_bytes())
136137

137-
@rule(key=keys, data=st.data())
138-
def get_invalid_keys(self, key: str, data: DataObject) -> None:
138+
@rule(key=zarr_keys, data=st.data())
139+
def get_invalid_zarr_keys(self, key: str, data: DataObject) -> None:
139140
note("(get_invalid)")
140141
assume(key not in self.model.keys())
141142
assert self.store.get(key, self.prototype) is None
@@ -196,7 +197,7 @@ def empty(self) -> None:
196197
# make sure they either both are or both aren't empty (same state)
197198
assert self.store.empty() == (not self.model)
198199

199-
@rule(key=keys)
200+
@rule(key=zarr_keys)
200201
def exists(self, key: str) -> None:
201202
note("(exists)")
202203

@@ -217,13 +218,13 @@ def check_vals_equal(self) -> None:
217218
assert self.model[key].to_bytes() == store_item
218219

219220
@invariant()
220-
def check_num_keys_equal(self) -> None:
221-
note("check num keys equal")
221+
def check_num_zarr_keys_equal(self) -> None:
222+
note("check num zarr_keys equal")
222223

223224
assert len(self.model) == len(list(self.store.list()))
224225

225226
@invariant()
226-
def check_keys(self) -> None:
227+
def check_zarr_keys(self) -> None:
227228
keys = list(self.store.list())
228229

229230
# NOTE: A local store can be non-empty if there are no files,
@@ -239,7 +240,7 @@ def check_keys(self) -> None:
239240
note("checking keys / exists / empty")
240241

241242

242-
def test_zarr_hierarchy(sync_store: Store):
243+
def test_zarr_hierarchy(sync_store: Store) -> None:
243244
def mk_test_instance_sync():
244245
return ZarrStoreStateMachine(sync_store)
245246

0 commit comments

Comments
 (0)