wip

Author: MarcoGorelli

pandas/tests/series/indexing/test_where.py

@@ -55,15 +55,13 @@ def test_where_unsafe_upcast(dtype, expected_dtype):
     s = Series(np.arange(10), dtype=dtype)
     values = [2.5, 3.5, 4.5, 5.5, 6.5]
     mask = s < 5
-    expected = Series(values + list(range(5, 10)), dtype=expected_dtype)
-    warn = (
-        None
-        if np.dtype(dtype).kind == np.dtype(expected_dtype).kind == "f"
-        else FutureWarning
-    )
-    with tm.assert_produces_warning(warn, match="incompatible dtype"):
+    if np.dtype(dtype).kind == np.dtype(expected_dtype).kind == "f":
         s[mask] = values
-    tm.assert_series_equal(s, expected)
+        expected = Series(values + list(range(5, 10)), dtype=expected_dtype)
+        tm.assert_series_equal(s, expected)
+    else:
+        with pytest.raises(TypeError, match="Invalid value"):
+            s[mask] = values
 
 
 def test_where_unsafe():

pandas/tests/series/test_missing.py

@@ -37,13 +37,8 @@ def test_timedelta64_nan(self):
         assert not isna(td1[0])
 
         # GH#16674 iNaT is treated as an integer when given by the user
-        with tm.assert_produces_warning(FutureWarning, match="incompatible dtype"):
+        with pytest.raises(TypeError, match="Invalid value"):
             td1[1] = iNaT
-        assert not isna(td1[1])
-        assert td1.dtype == np.object_
-        assert td1[1] == iNaT
-        td1[1] = td[1]
-        assert not isna(td1[1])
 
         td1[2] = NaT
         assert isna(td1[2])