Merge branch 'master' of https://github.com/pandas-dev/pandas into df…

…bugs
pandas-dev · jreback · Aug 14, 2018 · Aug 2, 2018 · Aug 2, 2018 · Aug 2, 2018
commit edc37925e954e5efd440fb6cf96d96d036b497a5
diff --git a/pandas/tests/test_arithmetic.py b/pandas/tests/test_arithmetic.py
@@ -12,7 +12,7 @@
 
 from pandas.compat import long
 from pandas.core import ops
-from pandas.errors import NullFrequencyError
+from pandas.errors import NullFrequencyError, PerformanceWarning
 from pandas import (
     timedelta_range,
     Timedelta, Timestamp, NaT, Series, TimedeltaIndex, DatetimeIndex)
@@ -268,11 +268,7 @@ def test_td64_radd_timestamp(self, box):
     @pytest.mark.parametrize('box', [
         pd.Index,
         Series,
-        pytest.param(pd.DataFrame,
-                     marks=pytest.mark.xfail(reason="Returns object dtype "
-                                                    "instead of "
-                                                    "datetime64[ns]",
-                                             strict=True))
+        pd.DataFrame
     ], ids=lambda x: x.__name__)
     def test_td64arr_add_sub_timestamp(self, box):
         # GH#11925
@@ -487,15 +483,8 @@ def test_td64arr_add_sub_numeric_arr_invalid(self, box, vec, dtype, tdser):
     # ------------------------------------------------------------------
     # Operations with timedelta-like others
 
-    @pytest.mark.parametrize('box', [
-        pd.Index,
-        Series,
-        pd.DataFrame
-    ], ids=lambda x: x.__name__)
-    def test_td64arr_add_sub_timestamp(self, box):
-        # GH#11925
-        ts = Timestamp('2012-01-01')
-        # TODO: parametrize over types of datetime scalar?
+    def test_td64arr_add_td64_array(self, box_df_fail):
+        box = box_df_fail  # DataFrame tries to broadcast incorrectly
 
         dti = pd.date_range('2016-01-01', periods=3)
         tdi = dti - dti.shift(1)