xfail dataframe case

pandas-dev · jorisvandenbossche · Nov 28, 2018 · Nov 19, 2018 · Nov 19, 2018 · Nov 19, 2018
commit 4dc17e2f0fb0565283bbfc3d1dc7657a1abd7651
diff --git a/pandas/_libs/tslibs/timestamps.pyx b/pandas/_libs/tslibs/timestamps.pyx
@@ -379,7 +379,7 @@ cdef class _Timestamp(datetime):
         typ = getattr(other, '_typ', None)
 
         # a Timestamp-DatetimeIndex -> yields a negative TimedeltaIndex
-        if typ == ('datetimeindex', 'datetimearray'):
+        if typ in ('datetimeindex', 'datetimearray'):
             # timezone comparison is performed in DatetimeIndex._sub_datelike
             return -other.__sub__(self)
 

diff --git a/pandas/tests/arithmetic/test_datetime64.py b/pandas/tests/arithmetic/test_datetime64.py
@@ -1252,6 +1252,10 @@ def test_dt64arr_add_mixed_offset_array(self, box_with_array):
     def test_dt64arr_add_sub_offset_ndarray(self, tz_naive_fixture,
                                             box_with_array):
         # GH#18849
+        if box_with_array is pd.DataFrame:
+            pytest.xfail("FIXME: ValueError with transpose; "
+                         "alignment error without")
+
         tz = tz_naive_fixture
         dti = pd.date_range('2017-01-01', periods=2, tz=tz)
         dtarr = tm.box_expected(dti, box_with_array)