Skip to content

Commit 1e11cef

Browse files
committed
Fix a test that was using an old parametrization
1 parent 5b0dfce commit 1e11cef

1 file changed

Lines changed: 14 additions & 11 deletions

File tree

tests/ndarray/test_indexing.py

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1237,17 +1237,19 @@ def test_forced_ooc_full_index_merge_preserves_sorted_sidecars(monkeypatch, tmp_
12371237

12381238

12391239
@pytest.mark.parametrize(
1240-
("optlevel", "expected_budget"),
1240+
("optlevel", "expected_multiplier", "expected_budget"),
12411241
[
1242-
(1, 256),
1243-
(3, 256),
1244-
(4, 512),
1245-
(6, 512),
1246-
(7, 1024),
1247-
(9, 1024),
1242+
(1, 1, 512),
1243+
(3, 1, 512),
1244+
(4, 2, 1024),
1245+
(6, 2, 1024),
1246+
(7, 4, 2048),
1247+
(9, 4, 2048),
12481248
],
12491249
)
1250-
def test_full_ooc_run_items_follow_optlevel(monkeypatch, tmp_path, optlevel, expected_budget):
1250+
def test_full_ooc_run_items_follow_optlevel(
1251+
monkeypatch, tmp_path, optlevel, expected_multiplier, expected_budget
1252+
):
12511253
path = tmp_path / f"full_ooc_optlevel_{optlevel}.b2nd"
12521254
data = np.arange(4096, dtype=np.int64)
12531255
arr = blosc2.asarray(data, urlpath=path, mode="w", chunks=(256,), blocks=(64,))
@@ -1257,14 +1259,15 @@ def test_full_ooc_run_items_follow_optlevel(monkeypatch, tmp_path, optlevel, exp
12571259
descriptor = arr.create_index(kind=blosc2.IndexKind.FULL, optlevel=optlevel)
12581260
full = descriptor["full"]
12591261

1262+
expected_sidecar_chunk_len = arr.chunks[0] * expected_multiplier
12601263
assert full["ooc_run_item_budget"] == expected_budget
12611264
assert full["ooc_run_items"] == expected_budget
12621265
assert full["ooc_run_item_budget_source"] == "optlevel"
1263-
assert full["chunk_multiplier"] == expected_budget // 256
1264-
assert full["sidecar_chunk_len"] == expected_budget
1266+
assert full["chunk_multiplier"] == expected_multiplier
1267+
assert full["sidecar_chunk_len"] == expected_sidecar_chunk_len
12651268
assert full["sidecar_block_len"] == arr.blocks[0]
12661269
values_sidecar = blosc2.open(full["values_path"], mode="r")
1267-
assert values_sidecar.chunks[0] == expected_budget
1270+
assert values_sidecar.chunks[0] == expected_sidecar_chunk_len
12681271
assert values_sidecar.blocks[0] == arr.blocks[0]
12691272

12701273

0 commit comments

Comments
 (0)