wip

Author: MarcoGorelli

pandas/tests/frame/indexing/test_where.py

@@ -513,26 +513,15 @@ def test_where_axis_with_upcast(self):
         tm.assert_frame_equal(result, expected)
 
         result = df.copy()
-        with tm.assert_produces_warning(FutureWarning, match="incompatible dtype"):
-            return_value = result.where(mask, ser, axis="index", inplace=True)
-        assert return_value is None
-        tm.assert_frame_equal(result, expected)
+        with pytest.raises(TypeError, match="Invalid value"):
+            result.where(mask, ser, axis="index", inplace=True)
 
         expected = DataFrame([[0, np.nan], [0, np.nan]])
         result = df.where(mask, ser, axis="columns")
         tm.assert_frame_equal(result, expected)
 
-        expected = DataFrame(
-            {
-                0: np.array([0, 0], dtype="int64"),
-                1: np.array([np.nan, np.nan], dtype="float64"),
-            }
-        )
-        result = df.copy()
-        with tm.assert_produces_warning(FutureWarning, match="incompatible dtype"):
-            return_value = result.where(mask, ser, axis="columns", inplace=True)
-        assert return_value is None
-        tm.assert_frame_equal(result, expected)
+        with pytest.raises(TypeError, match="Invalid value"):
+            result.where(mask, ser, axis="columns", inplace=True)
 
     def test_where_axis_multiple_dtypes(self):
         # Multiple dtypes (=> multiple Blocks)