xfail only on xarray < 0.10.0

Author: jreback

pandas/tests/generic/test_frame.py

@@ -3,6 +3,7 @@
 
 from operator import methodcaller
 from copy import deepcopy
+from distutils.version import LooseVersion
 
 import pytest
 import numpy as np
@@ -18,6 +19,12 @@
 import pandas.util.testing as tm
 from .test_generic import Generic
 
+try:
+    import xarray
+    _XARRAY_INSTALLED = True
+except ImportError:
+    _XARRAY_INSTALLED = False
+
 
 class TestDataFrame(Generic):
     _typ = DataFrame
@@ -165,7 +172,9 @@ def test_set_attribute(self):
         assert df.y == 5
         assert_series_equal(df['y'], Series([2, 4, 6], name='y'))
 
-    @pytest.mark.xfail(reason="returning MultiIndex")
+    @pytest.mark.skipif(_XARRAY_INSTALLED and
+                        LooseVersion(xarray.__version__) < '0.10.0',
+                        reason='xarray >= 0.10.0 required')
     @pytest.mark.parametrize(
         "index", ['FloatIndex', 'IntIndex',
                   'StringIndex', 'UnicodeIndex',

pandas/tests/generic/test_series.py

@@ -17,6 +17,12 @@
 import pandas.util.testing as tm
 from .test_generic import Generic
 
+try:
+    import xarray
+    _XARRAY_INSTALLED = True
+except ImportError:
+    _XARRAY_INSTALLED = False
+
 
 class TestSeries(Generic):
     _typ = Series
@@ -166,15 +172,16 @@ def finalize(self, other, method=None, **kwargs):
         Series._metadata = _metadata
         Series.__finalize__ = _finalize
 
-    @pytest.mark.xfail(reason="returning MultiIndex")
+    @pytest.mark.skipif(_XARRAY_INSTALLED and
+                        LooseVersion(xarray.__version__) < '0.10.0',
+                        reason='xarray >= 0.10.0 required')
     @pytest.mark.parametrize(
         "index",
         ['FloatIndex', 'IntIndex',
          'StringIndex', 'UnicodeIndex',
          'DateIndex', 'PeriodIndex',
-         'TimedeltaIndex'])
+         'TimedeltaIndex', 'CategoricalIndex'])
     def test_to_xarray_index_types(self, index):
-        tm._skip_if_no_xarray()
         from xarray import DataArray
 
         index = getattr(tm, 'make{}'.format(index))
@@ -187,29 +194,6 @@ def test_to_xarray_index_types(self, index):
         assert_almost_equal(list(result.coords.keys()), ['foo'])
         assert isinstance(result, DataArray)
 
-        # idempotency
-        assert_series_equal(result.to_series(), s,
-                            check_index_type=False)
-
-    @pytest.mark.xfail(reason="returning MultiIndex")
-    def test_to_xarray_index_types_categorical(self):
-        tm._skip_if_no_xarray()
-        import xarray
-        if LooseVersion(xarray.__version__) < '0.8.0':
-            pytest.skip("xarray < 0.8.0 doesn't support categoricals")
-        from xarray import DataArray
-
-        index = tm.makeCategoricalIndex
-
-        s = Series(range(6), index=index(6))
-        s.index.name = 'foo'
-        result = s.to_xarray()
-        repr(result)
-        assert len(result) == 6
-        assert len(result.coords) == 1
-        assert_almost_equal(list(result.coords.keys()), ['foo'])
-        assert isinstance(result, DataArray)
-
         # idempotency
         assert_series_equal(result.to_series(), s,
                             check_index_type=False,