Merge pull request pandas-dev#13 from jbrockmendel/cifix

Fix failing tests
jbrockmendel · Jan 1, 2019 · 8fad32e · 8fad32e
2 parents 9d37675 + 38817a5
commit 8fad32e
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/pandas/tests/test_base.py b/pandas/tests/test_base.py
@@ -12,7 +12,7 @@
 from pandas.core.dtypes.dtypes import DatetimeTZDtype
 from pandas.core.dtypes.common import (
     is_object_dtype, is_datetime64_dtype, is_datetime64tz_dtype,
-    needs_i8_conversion)
+    is_timedelta64_dtype, needs_i8_conversion)
 import pandas.util.testing as tm
 from pandas import (Series, Index, DatetimeIndex, TimedeltaIndex,
                     PeriodIndex, Timedelta, IntervalIndex, Interval,
@@ -1224,6 +1224,8 @@ def test_numpy_array_all_dtypes(any_numpy_dtype):
     result = ser.array
     if is_datetime64_dtype(any_numpy_dtype):
         assert isinstance(result, DatetimeArray)
+    elif is_timedelta64_dtype(any_numpy_dtype):
+        assert isinstance(result, TimedeltaArray)
     else:
         assert isinstance(result, PandasArray)