No commit message

xarray/tests/conftest.py

@@ -4,6 +4,7 @@
 import pandas as pd
 import pytest
 
+import xarray as xr
 from xarray import DataArray, Dataset
 from xarray.tests import create_test_data, requires_dask
 
@@ -13,6 +14,19 @@ def backend(request):
     return request.param
 
 
+@pytest.fixture(params=["numbagg", "bottleneck"])
+def compute_backend(request):
+    if request.param == "bottleneck":
+        options = dict(use_bottleneck=True, use_numbagg=False)
+    elif request.param == "numbagg":
+        options = dict(use_bottleneck=False, use_numbagg=True)
+    else:
+        raise ValueError
+
+    with xr.set_options(**options):
+        yield request.param
+
+
 @pytest.fixture(params=[1])
 def ds(request, backend):
     if request.param == 1:

xarray/tests/test_rolling.py

@@ -23,18 +23,6 @@
 ]
 
 
-@pytest.fixture(params=["numbagg", "bottleneck"])
-def compute_backend(request):
-    if request.param == "bottleneck":
-        options = dict(use_bottleneck=True, use_numbagg=False)
-    elif request.param == "numbagg":
-        options = dict(use_bottleneck=False, use_numbagg=True)
-    else:
-        raise ValueError
-
-    with xr.set_options(**options):
-        yield request.param
-
 
 @pytest.mark.parametrize("func", ["mean", "sum"])
 @pytest.mark.parametrize("min_periods", [1, 10])

xarray/tests/test_variable.py

@@ -1754,7 +1754,8 @@ def test_reduce(self):
             v.mean(dim="x", axis=0)
 
     @requires_bottleneck
-    def test_reduce_use_bottleneck(self, monkeypatch):
+    @pytest.mark.parametrize("compute_backend", ["bottleneck"], indirect=True)
+    def test_reduce_use_bottleneck(self, monkeypatch, compute_backend):
         def raise_if_called(*args, **kwargs):
             raise RuntimeError("should not have been called")