Skip to content

Commit

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

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 @@ -269,7 +268,6 @@ 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 2f80cef

Please sign in to comment.