additional test fixes (for tests that changed or no longer exist on main)

Author: jorisvandenbossche

pandas/tests/frame/methods/test_quantile.py

@@ -354,7 +354,6 @@ def test_quantile_multi_empty(self, interp_method):
         )
         tm.assert_frame_equal(result, expected)
 
-    @pytest.mark.xfail(using_string_dtype(), reason="TODO(infer_string)")
     def test_quantile_datetime(self, unit):
         dti = pd.to_datetime(["2010", "2011"]).as_unit(unit)
         df = DataFrame({"a": dti, "b": [0, 5]})
@@ -408,7 +407,6 @@ def test_quantile_datetime(self, unit):
         expected = DataFrame(index=[0.5], columns=[])
         tm.assert_frame_equal(result, expected)
 
-    @pytest.mark.xfail(using_string_dtype(), reason="TODO(infer_string)")
     @pytest.mark.parametrize(
         "dtype",
         [
@@ -679,7 +677,6 @@ def test_quantile_nat(self, interp_method, request, using_array_manager, unit):
         )
         tm.assert_frame_equal(res, exp)
 
-    @pytest.mark.xfail(using_string_dtype(), reason="TODO(infer_string)")
     def test_quantile_empty_no_rows_floats(self, interp_method):
         interpolation, method = interp_method
 

pandas/tests/groupby/test_apply.py

@@ -6,6 +6,8 @@
 import numpy as np
 import pytest
 
+from pandas._config import using_string_dtype
+
 import pandas as pd
 from pandas import (
     DataFrame,
@@ -126,7 +128,7 @@ def test_apply_trivial(using_infer_string):
         {"key": ["a", "a", "b", "b", "a"], "data": [1.0, 2.0, 3.0, 4.0, 5.0]},
         columns=["key", "data"],
     )
-    dtype = "string" if using_infer_string else "object"
+    dtype = "str" if using_infer_string else "object"
     expected = pd.concat([df.iloc[1:], df.iloc[1:]], axis=1, keys=["float64", dtype])
 
     msg = "DataFrame.groupby with axis=1 is deprecated"
@@ -143,7 +145,7 @@ def test_apply_trivial_fail(using_infer_string):
         {"key": ["a", "a", "b", "b", "a"], "data": [1.0, 2.0, 3.0, 4.0, 5.0]},
         columns=["key", "data"],
     )
-    dtype = "string" if using_infer_string else "object"
+    dtype = "str" if using_infer_string else "object"
     expected = pd.concat([df, df], axis=1, keys=["float64", dtype])
     msg = "DataFrame.groupby with axis=1 is deprecated"
     with tm.assert_produces_warning(FutureWarning, match=msg):
@@ -1299,12 +1301,13 @@ def test_apply_dropna_with_indexed_same(dropna):
 @pytest.mark.parametrize(
     "as_index, expected",
     [
-        [
+        pytest.param(
             False,
             DataFrame(
                 [[1, 1, 1], [2, 2, 1]], columns=Index(["a", "b", None], dtype=object)
             ),
-        ],
+            marks=pytest.mark.xfail(using_string_dtype(), reason="TODO(infer_string)"),
+        ),
         [
             True,
             Series(

pandas/tests/indexing/test_coercion.py

@@ -834,6 +834,7 @@ def replacer(self, how, from_key, to_key):
     def test_replace_series(self, how, to_key, from_key, replacer):
         index = pd.Index([3, 4], name="xxx")
         obj = pd.Series(self.rep[from_key], index=index, name="yyy")
+        obj = obj.astype(from_key)
         assert obj.dtype == from_key
 
         if from_key.startswith("datetime") and to_key.startswith("datetime"):
@@ -854,7 +855,6 @@ def test_replace_series(self, how, to_key, from_key, replacer):
 
         else:
             exp = pd.Series(self.rep[to_key], index=index, name="yyy")
-            assert exp.dtype == to_key
 
         msg = "Downcasting behavior in `replace`"
         warn = FutureWarning

pandas/tests/io/parser/common/test_file_buffer_url.py

@@ -87,8 +87,8 @@ def test_path_local_path(all_parsers):
     parser = all_parsers
     df = DataFrame(
         1.1 * np.arange(120).reshape((30, 4)),
-        columns=Index(list("ABCD"), dtype=object),
-        index=Index([f"i-{i}" for i in range(30)], dtype=object),
+        columns=Index(list("ABCD")),
+        index=Index([f"i-{i}" for i in range(30)]),
     )
     result = tm.round_trip_localpath(
         df.to_csv, lambda p: parser.read_csv(p, index_col=0)