Skip to content

Commit

Permalink
un-xfail tests fixed by pandas-dev#22163
Browse files Browse the repository at this point in the history
  • Loading branch information
jbrockmendel committed Aug 16, 2018
1 parent b5d81cf commit 05b2c50
Showing 1 changed file with 0 additions and 9 deletions.
9 changes: 0 additions & 9 deletions pandas/tests/test_arithmetic.py
Original file line number Diff line number Diff line change
Expand Up @@ -865,9 +865,6 @@ def test_td64arr_sub_NaT(self, box):

def test_td64arr_add_timedeltalike(self, delta, box):
# only test adding/sub offsets as + is now numeric
if box is pd.DataFrame and isinstance(delta, pd.DateOffset):
pytest.xfail(reason="Returns object dtype instead of m8[ns]")

rng = timedelta_range('1 days', '10 days')
expected = timedelta_range('1 days 02:00:00', '10 days 02:00:00',
freq='D')
Expand All @@ -879,9 +876,6 @@ def test_td64arr_add_timedeltalike(self, delta, box):

def test_td64arr_sub_timedeltalike(self, delta, box):
# only test adding/sub offsets as - is now numeric
if box is pd.DataFrame and isinstance(delta, pd.DateOffset):
pytest.xfail(reason="Returns object dtype instead of m8[ns]")

rng = timedelta_range('1 days', '10 days')
expected = timedelta_range('0 days 22:00:00', '9 days 22:00:00')

Expand Down Expand Up @@ -1132,9 +1126,6 @@ def test_td64arr_mul_int(self, box):
tm.assert_equal(result, idx)

def test_td64arr_mul_tdlike_scalar_raises(self, delta, box):
if box is pd.DataFrame and not isinstance(delta, pd.DateOffset):
pytest.xfail(reason="returns m8[ns] instead of raising")

rng = timedelta_range('1 days', '10 days', name='foo')
rng = tm.box_expected(rng, box)
with pytest.raises(TypeError):
Expand Down

0 comments on commit 05b2c50

Please sign in to comment.