test fixes

Author: dcherian

cf_xarray/accessor.py

@@ -45,11 +45,12 @@ def _getattr(
     @functools.wraps(func)
     def wrapper(*args, **kwargs):
         arguments = accessor._process_signature(func, args, kwargs, keys=keys)
-        rv = func(**arguments)
-        if wrap_classes and isinstance(rv, _WRAPPED_CLASSES):
-            return _CFWrappedClass(obj, rv, accessor)
-        else:
-            return rv
+
+        result = func(**arguments)
+        if wrap_classes and isinstance(result, _WRAPPED_CLASSES):
+            result = _CFWrappedClass(result, accessor)
+
+        return result
 
     return wrapper
 

cf_xarray/tests/test_accessor.py

@@ -1,3 +1,5 @@
+import matplotlib as mpl
+import matplotlib.pyplot as plt
 import pytest
 import xarray as xr
 from xarray.testing import assert_identical
@@ -6,20 +8,18 @@
 
 from . import raise_if_dask_computes
 
+mpl.use("Agg")
 ds = xr.tutorial.open_dataset("air_temperature").isel(time=slice(4))
-objects = [
-    pytest.param(ds, marks=pytest.mark.xfail),
-    ds.air,
-    pytest.param(ds.chunk({"lat": 5}), marks=pytest.mark.xfail),
-    ds.air.chunk({"lat": 5}),
-]
+datasets = [ds, ds.chunk({"lat": 5})]
+dataarrays = [ds.air, ds.air.chunk({"lat": 5})]
+objects = datasets + dataarrays
 
 
 @pytest.mark.parametrize("obj", objects)
 def test_wrapped_classes(obj):
     with raise_if_dask_computes():
-        expected = obj.resample(time="M").mean("lat")
-        actual = obj.cf.resample(T="M").mean("Y")
+        expected = obj.resample(time="M").mean()
+        actual = obj.cf.resample(T="M").mean()
     assert_identical(expected, actual)
 
     # groupby
@@ -41,12 +41,25 @@ def test_other_methods(obj):
     assert_identical(expected, actual)
 
 
-@pytest.mark.parametrize("obj", objects)
-def test_plot(obj):
+@pytest.mark.parametrize("obj", dataarrays)
+def test_dataarray_plot(obj):
+
     obj.isel(time=1).cf.plot(x="X", y="Y")
+    plt.close()
+
     obj.isel(time=1).cf.plot.contourf(x="X", y="Y")
+    plt.close()
 
     obj.cf.plot(x="X", y="Y", col="T")
+    plt.close()
+
     obj.cf.plot.contourf(x="X", y="Y", col="T")
+    plt.close()
 
     obj.isel(lat=[0, 1], lon=1).cf.plot.line(x="T", hue="Y")
+    plt.close()
+
+
+@pytest.mark.parametrize("obj", datasets)
+def test_dataset_plot(obj):
+    pass

ci/environment.yaml

@@ -5,5 +5,6 @@ dependencies:
   - pytest-cov
   - pytest
   - dask
+  - matplotlib
   - netcdf4
   - xarray