Skip to content

Commit

Permalink
Add xfail for #1586
Browse files Browse the repository at this point in the history
  • Loading branch information
gimperiale committed Oct 6, 2017
1 parent 72cf0e7 commit f99313c
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions xarray/tests/test_combine.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

import numpy as np
import pandas as pd
import pytest

from xarray import Dataset, DataArray, auto_combine, concat, Variable
from xarray.core.pycompat import iteritems, OrderedDict
Expand Down Expand Up @@ -268,6 +269,7 @@ def test_concat(self):
with self.assertRaisesRegexp(ValueError, 'not a valid argument'):
concat([foo, bar], dim='w', data_vars='minimal')

@pytest.mark.xfail(reason='https://github.com/pydata/xarray/issues/1586')
def test_concat_encoding(self):
# Regression test for GH1297
ds = Dataset({'foo': (['x', 'y'], np.random.random((2, 3))),
Expand Down

0 comments on commit f99313c

Please sign in to comment.