ensure shape is always passed to array_strategy_fn

TomNicholas · Nov 2, 2023 · 0e01d76 · 0e01d76
1 parent 700d652
commit 0e01d76
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/xarray/testing/strategies.py b/xarray/testing/strategies.py
@@ -327,8 +327,10 @@ def variables(
             )
 
     else:
-        # nothing provided, so generate everything consistently by drawing dims to match data
-        array_strategy = _array_strategy_fn(dtype=_dtype)
+        # nothing provided, so generate everything consistently
+        # We still generate the shape first here just so that we always pass shape to array_strategy_fn
+        _shape = draw(npst.array_shapes())
+        array_strategy = _array_strategy_fn(shape=_shape, dtype=_dtype)
         _data = draw(array_strategy)
         dim_names = draw(dimension_names(min_dims=_data.ndim, max_dims=_data.ndim))
 

diff --git a/xarray/tests/test_strategies.py b/xarray/tests/test_strategies.py
@@ -163,7 +163,7 @@ def fixed_array_strategy_fn(*, shape=None, dtype=None):
 
         var = data.draw(
             variables(
-                array_strategy_fn=fixed_array_strategy_fn, dtype=st.just(arr.dtype)  # type: ignore[arg-type]
+                array_strategy_fn=fixed_array_strategy_fn, dims=st.just({"x": 2, "y": 2}), dtype=st.just(arr.dtype)  # type: ignore[arg-type]
             )
         )